d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetical changes.

Browse Source
This commit is contained in:
Nick Hibma 1999-03-22 19:58:59 +00:00
parent 86df1e04cc
commit 83fac6ab3f
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/usb/uhcireg.h
View File

@ -102,7 +102,7 @@
#define UHCI_PORTSC_OCIC 0x0800
#define UHCI_PORTSC_SUSP 0x1000
#define UHCI_LEGSUP 0xC0
#define UHCI_LEGSUP 0xc0
#define UHCI_FRAMELIST_COUNT 1024
#define UHCI_FRAMELIST_ALIGN 4096

4
sys/dev/usb/uhub.c
View File

@ -340,9 +340,9 @@ uhub_explore(dev)
up = &dev->hub->ports[port-1];
r = usbd_get_port_status(dev, port, &up->status);
if (r != USBD_NORMAL_COMPLETION) {
DPRINTF(("uhub_explore: get port status failed, "
DPRINTF(("uhub_explore: get port status failed, on port %d "
"error=%d(%s)\n",
r, usbd_error_strs[r]));
port, r, usbd_error_strs[r]));
continue;
}
status = UGETW(up->status.wPortStatus);

8
sys/dev/usb/ulpt.c
View File

@ -300,11 +300,11 @@ ulptopen(dev, flag, mode, p)
sc->sc_flags = flags;
DPRINTF(("ulptopen: flags=0x%x\n", (unsigned)flags));
#if USB_DEBUG && defined(__FreeBSD__)
#if defined(USB_DEBUG) && defined(__FreeBSD__)
/* Ignoring these flags might not be a good idea */
if ((flags ^ ULPT_NOPRIME) != 0)
DPRINTF(("flags ignored: %b\n", flags,
"\20\3POS_INIT\4POS_ACK\6PRIME_OPEN\7AUTOLF\10BYPASS"));
if ((flags & ~ULPT_NOPRIME) != 0)
printf("ulptopen: flags ignored: %b\n", flags,
"\20\3POS_INIT\4POS_ACK\6PRIME_OPEN\7AUTOLF\10BYPASS");
#endif
if ((flags & ULPT_NOPRIME) == 0)
ulpt_reset(sc);

5
sys/dev/usb/usb_if.m
View File

@ -25,7 +25,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# $Id$
# $Id: usb_if.m,v 1.3 1999/01/07 23:31:37 n_hibma Exp $
#
# USB interface description
@ -33,9 +33,8 @@
INTERFACE usb;
# The device should start probing for new children again
# The device should start probing for new drivers again
#
METHOD int reconfigure {
device_t dev;
};

4
sys/dev/usb/usb_subr.c
View File

@ -794,6 +794,8 @@ usbd_probe_and_attach(parent, dev, port, addr)
found++;
ifaces[i] = 0; /* consumed */
#elif defined(__FreeBSD__)
/* XXX FreeBSD can't handle multiple intfaces
* on 1 device yet */
return (USBD_NORMAL_COMPLETION);
#endif
}
@ -972,7 +974,7 @@ usbd_new_device(parent, bus, depth, lowspeed, port, up)
usbd_remove_device(dev, up);
return (r);
}
return (USBD_NORMAL_COMPLETION);
}

2
sys/dev/usb/usbdi.c
View File

@ -672,7 +672,6 @@ usbd_get_bus_handle(index, bus)
{
return (usb_get_bus_handle(index, bus));
}
#endif
usbd_status
usbd_get_root_hub(bus, dev)
@ -706,6 +705,7 @@ usbd_hub2device_handle(dev, port, devp)
*devp = dev->hub->ports[port].device;
return (USBD_NORMAL_COMPLETION);
}
#endif
usbd_status
usbd_request2pipe_handle(reqh, pipe)

2
sys/dev/usb/usbdi.h
View File

@ -178,12 +178,12 @@ usbd_status usbd_interface_count
#if 0
u_int8_t usbd_bus_count __P((void));
usbd_status usbd_get_bus_handle __P((u_int8_t index, usbd_bus_handle *bus));
#endif
usbd_status usbd_get_root_hub
__P((usbd_bus_handle bus, usbd_device_handle *dev));
usbd_status usbd_port_count __P((usbd_device_handle hub, u_int8_t *nports));
usbd_status usbd_hub2device_handle
__P((usbd_device_handle hub, u_int8_t port, usbd_device_handle *dev));
#endif
usbd_status usbd_request2pipe_handle
__P((usbd_request_handle reqh, usbd_pipe_handle *pipe));
usbd_status usbd_pipe2interface_handle