Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compilation issues.

This commit is contained in:
christos 2006-12-05 17:35:35 +00:00
parent 7e7373acc9
commit 682562feb0
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sys/dev/usb/usb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb.c,v 1.92 2006/12/03 22:34:58 pavel Exp $ */ /* $NetBSD: usb.c,v 1.93 2006/12/05 17:35:35 christos Exp $ */
/* /*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.92 2006/12/03 22:34:58 pavel Exp $"); __KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.93 2006/12/05 17:35:35 christos Exp $");
#include "opt_compat_netbsd.h" #include "opt_compat_netbsd.h"
@ -437,7 +437,7 @@ usbread(dev_t dev, struct uio *uio, int flag)
{ {
struct usb_event *ue; struct usb_event *ue;
#ifdef COMPAT_30 #ifdef COMPAT_30
struct usb_event_old *ueo; struct usb_event_old *ueo = NULL; /* XXXGCC */
#endif #endif
int s, error, n, useold; int s, error, n, useold;
@ -445,8 +445,6 @@ usbread(dev_t dev, struct uio *uio, int flag)
return (ENXIO); return (ENXIO);
useold = 0; useold = 0;
/* XXXGCC */
ueo = NULL;
switch (uio->uio_resid) { switch (uio->uio_resid) {
#ifdef COMPAT_30 #ifdef COMPAT_30
case sizeof(struct usb_event_old): case sizeof(struct usb_event_old):
@ -635,35 +633,35 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, struct lwp *l)
} }
case USB_DEVICEINFO: case USB_DEVICEINFO:
#ifdef COMPAT_30
case USB_DEVICEINFO_OLD:
#endif
{ {
struct usb_device_info *di = (void *)data;
#ifdef COMPAT_30
struct usb_device_info_old *dio = (void *)data;
#endif
int addr;
usbd_device_handle dev; usbd_device_handle dev;
struct usb_device_info *di = (void *)data;
int addr = di->udi_addr;
if (cmd == USB_DEVICEINFO)
addr=di->udi_addr;
else
addr=dio->udi_addr;
if (addr < 1 || addr >= USB_MAX_DEVICES) if (addr < 1 || addr >= USB_MAX_DEVICES)
return (EINVAL); return EINVAL;
dev = sc->sc_bus->devices[addr]; if ((dev = sc->sc_bus->devices[addr]) == NULL)
if (dev == NULL) return ENXIO;
return (ENXIO); usbd_fill_deviceinfo(dev, di, 1);
if (cmd == USB_DEVICEINFO)
usbd_fill_deviceinfo(dev, di, 1);
#ifdef COMPAT_30
else
usbd_fill_deviceinfo_old(dev, dio, 1);
#endif
break; break;
} }
#ifdef COMPAT_30
case USB_DEVICEINFO_OLD:
{
usbd_device_handle dev;
struct usb_device_info_old *di = (void *)data;
int addr = di->udi_addr;
if (addr < 1 || addr >= USB_MAX_DEVICES)
return EINVAL;
if ((dev = sc->sc_bus->devices[addr]) == NULL)
return ENXIO;
usbd_fill_deviceinfo_old(dev, di, 1);
break;
}
#endif
case USB_DEVICESTATS: case USB_DEVICESTATS:
*(struct usb_device_stats *)data = sc->sc_bus->stats; *(struct usb_device_stats *)data = sc->sc_bus->stats;
break; break;

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

@ -1,4 +1,4 @@
/* $NetBSD: usbdi.h,v 1.71 2006/12/03 22:34:58 pavel Exp $ */ /* $NetBSD: usbdi.h,v 1.72 2006/12/05 17:35:35 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/* /*
@ -150,7 +150,10 @@ usbd_status usbd_set_interface(usbd_interface_handle, int);
int usbd_get_no_alts(usb_config_descriptor_t *, int); int usbd_get_no_alts(usb_config_descriptor_t *, int);
usbd_status usbd_get_interface(usbd_interface_handle, u_int8_t *); usbd_status usbd_get_interface(usbd_interface_handle, u_int8_t *);
void usbd_fill_deviceinfo(usbd_device_handle, struct usb_device_info *, int); void usbd_fill_deviceinfo(usbd_device_handle, struct usb_device_info *, int);
void usbd_fill_deviceinfo_old(usbd_device_handle, struct usb_device_info_old *, int); #ifdef COMPAT_30
void usbd_fill_deviceinfo_old(usbd_device_handle, struct usb_device_info_old *,
int);
#endif
int usbd_get_interface_altindex(usbd_interface_handle); int usbd_get_interface_altindex(usbd_interface_handle);
usb_interface_descriptor_t *usbd_find_idesc(usb_config_descriptor_t *, usb_interface_descriptor_t *usbd_find_idesc(usb_config_descriptor_t *,