Deleted Added
full compact
octusb.h (228483) octusb.h (229168)
1/* $FreeBSD: head/sys/mips/cavium/usb/octusb.h 228483 2011-12-14 00:28:54Z hselasky $ */
1/* $FreeBSD: head/sys/mips/cavium/usb/octusb.h 229168 2012-01-01 09:12:21Z gonzo $ */
2
3/*-
4 * Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 14 unchanged lines hidden (view full) ---

24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#ifndef _OCTUSB_H_
29#define _OCTUSB_H_
30
31#define OCTUSB_MAX_DEVICES MIN(USB_MAX_DEVICES, 64)
2
3/*-
4 * Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 14 unchanged lines hidden (view full) ---

24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#ifndef _OCTUSB_H_
29#define _OCTUSB_H_
30
31#define OCTUSB_MAX_DEVICES MIN(USB_MAX_DEVICES, 64)
32/*
33 * The second port is on a different IRQ and so we disable it for now.
34 */
35#if 1
36#define OCTUSB_MAX_PORTS 1 /* hardcoded */
37#else
38#define OCTUSB_MAX_PORTS 2 /* hardcoded */
32#define OCTUSB_MAX_PORTS 2 /* hardcoded */
39#endif
40#define OCTUSB_MAX_FIXUP 4096 /* bytes */
41#define OCTUSB_INTR_ENDPT 0x01
42
43struct octusb_qh;
44struct octusb_td;
45struct octusb_softc;
46
47typedef uint8_t (octusb_cmd_t)(struct octusb_td *td);

--- 68 unchanged lines hidden (view full) ---

116
117struct octusb_softc {
118
119 struct usb_bus sc_bus; /* base device */
120 union octusb_hub_desc sc_hub_desc;
121
122 struct usb_device *sc_devices[OCTUSB_MAX_DEVICES];
123
33#define OCTUSB_MAX_FIXUP 4096 /* bytes */
34#define OCTUSB_INTR_ENDPT 0x01
35
36struct octusb_qh;
37struct octusb_td;
38struct octusb_softc;
39
40typedef uint8_t (octusb_cmd_t)(struct octusb_td *td);

--- 68 unchanged lines hidden (view full) ---

109
110struct octusb_softc {
111
112 struct usb_bus sc_bus; /* base device */
113 union octusb_hub_desc sc_hub_desc;
114
115 struct usb_device *sc_devices[OCTUSB_MAX_DEVICES];
116
124 struct resource *sc_irq_res;
125 void *sc_intr_hdl;
117 struct resource *sc_irq_res[OCTUSB_MAX_PORTS];
118 void *sc_intr_hdl[OCTUSB_MAX_PORTS];
126
127 struct octusb_port sc_port[OCTUSB_MAX_PORTS];
128 device_t sc_dev;
129
130 struct usb_hub_descriptor_min sc_hubd;
131
132 uint8_t sc_noport; /* number of ports */
133 uint8_t sc_addr; /* device address */

--- 12 unchanged lines hidden ---
119
120 struct octusb_port sc_port[OCTUSB_MAX_PORTS];
121 device_t sc_dev;
122
123 struct usb_hub_descriptor_min sc_hubd;
124
125 uint8_t sc_noport; /* number of ports */
126 uint8_t sc_addr; /* device address */

--- 12 unchanged lines hidden ---