diff options
author | brueffer <brueffer@FreeBSD.org> | 2007-06-07 09:29:37 +0000 |
---|---|---|
committer | brueffer <brueffer@FreeBSD.org> | 2007-06-07 09:29:37 +0000 |
commit | 13b09119191d34ad6dcdd7dd4d68c215a4ac16eb (patch) | |
tree | 62d6b4ef5d74487374c481941b3b05ed5cf10890 /sys | |
parent | cc08ec917e4bcbda40cdf2b00fe869cb3344cb5f (diff) | |
download | FreeBSD-src-13b09119191d34ad6dcdd7dd4d68c215a4ac16eb.zip FreeBSD-src-13b09119191d34ad6dcdd7dd4d68c215a4ac16eb.tar.gz |
Remove compat ifdefs for version < 500014 from the rest of the USB files.
Approved by: rwatson (mentor)
MFC after: 1 week
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/usb/ubsa.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/ucom.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/udbp.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/ufm.c | 7 | ||||
-rw-r--r-- | sys/dev/usb/uftdi.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/uhid.c | 7 | ||||
-rw-r--r-- | sys/dev/usb/ulpt.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/ums.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/uplcom.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/urio.c | 7 | ||||
-rw-r--r-- | sys/dev/usb/usb.c | 7 | ||||
-rw-r--r-- | sys/dev/usb/usb.h | 4 | ||||
-rw-r--r-- | sys/dev/usb/uscanner.c | 7 | ||||
-rw-r--r-- | sys/dev/usb/uvscom.c | 4 |
14 files changed, 0 insertions, 69 deletions
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 7812329..aeb7bf5 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -74,11 +74,7 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/tty.h> #include <sys/file.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/proc.h> #include <sys/poll.h> #include <sys/sysctl.h> diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index da24a05..8c9dd6f 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -79,11 +79,7 @@ __FBSDID("$FreeBSD$"); #include <sys/tty.h> #include <sys/clist.h> #include <sys/file.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/proc.h> #include <sys/poll.h> #include <sys/sysctl.h> diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c index 021330b..f63dffc 100644 --- a/sys/dev/usb/udbp.c +++ b/sys/dev/usb/udbp.c @@ -79,11 +79,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/conf.h> #include <sys/file.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/poll.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c index 013fecd..0093023 100644 --- a/sys/dev/usb/ufm.c +++ b/sys/dev/usb/ufm.c @@ -50,11 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/uio.h> #include <sys/tty.h> #include <sys/file.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/poll.h> #include <sys/sysctl.h> @@ -95,9 +91,6 @@ static struct cdevsw ufm_cdevsw = { .d_close = ufmclose, .d_ioctl = ufmioctl, .d_name = "ufm", -#if (__FreeBSD_version < 500014) - .d_bmaj = -1 -#endif }; #endif /*defined(__FreeBSD__)*/ diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c index f504fbe..8f124d2 100644 --- a/sys/dev/usb/uftdi.c +++ b/sys/dev/usb/uftdi.c @@ -57,11 +57,7 @@ __FBSDID("$FreeBSD$"); #include <sys/tty.h> #include <sys/file.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/sysctl.h> diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 78ab1e2..e0ae70e 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -69,11 +69,7 @@ __FBSDID("$FreeBSD$"); #endif #include <sys/conf.h> #include <sys/tty.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/proc.h> #include <sys/poll.h> #include <sys/sysctl.h> @@ -168,9 +164,6 @@ static struct cdevsw uhid_cdevsw = { .d_ioctl = uhidioctl, .d_poll = uhidpoll, .d_name = "uhid", -#if __FreeBSD_version < 500014 - .d_bmaj -1 -#endif }; #endif diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index b627547..399c8ae 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -165,9 +165,6 @@ static struct cdevsw ulpt_cdevsw = { .d_read = ulptread, .d_ioctl = ulptioctl, .d_name = "ulpt", -#if __FreeBSD_version < 500014 - .d_bmaj -1 -#endif }; #endif diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index f65f1c7..878a1b3 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -155,9 +155,6 @@ static struct cdevsw ums_cdevsw = { .d_ioctl = ums_ioctl, .d_poll = ums_poll, .d_name = "ums", -#if __FreeBSD_version < 500014 - .d_bmaj -1 -#endif }; USB_DECLARE_DRIVER(ums); diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 2dd9bc3..b767914 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -98,11 +98,7 @@ __FBSDID("$FreeBSD$"); #include <sys/serial.h> #include <sys/tty.h> #include <sys/file.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/proc.h> #include <sys/poll.h> #include <sys/sysctl.h> diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c index 0b0a3d3..debbd64 100644 --- a/sys/dev/usb/urio.c +++ b/sys/dev/usb/urio.c @@ -62,11 +62,7 @@ __FBSDID("$FreeBSD$"); #include <sys/uio.h> #include <sys/tty.h> #include <sys/file.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/poll.h> #include <sys/sysctl.h> #include <sys/uio.h> @@ -125,9 +121,6 @@ static struct cdevsw urio_cdevsw = { .d_write = uriowrite, .d_ioctl = urioioctl, .d_name = "urio", -#if __FreeBSD_version < 500014 - .d_bmaj = -1 -#endif }; #define RIO_UE_GET_DIR(p) ((UE_GET_DIR(p) == UE_DIR_IN) ? RIO_IN :\ ((UE_GET_DIR(p) == UE_DIR_OUT) ? RIO_OUT :\ diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 53a9935..cc073aa 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -73,11 +73,7 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/conf.h> #include <sys/poll.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/signalvar.h> #include <sys/sysctl.h> #include <sys/uio.h> @@ -165,9 +161,6 @@ struct cdevsw usb_cdevsw = { .d_ioctl = usbioctl, .d_poll = usbpoll, .d_name = "usb", -#if __FreeBSD_version < 500014 - .d_bmaj = -1 -#endif }; #endif diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index 55b43c7..b1c5915 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -106,11 +106,7 @@ typedef u_int8_t uDWord[4]; #define USETDW(w,v) (*(u_int32_t *)(w) = (v)) #endif -#if defined(__FreeBSD__) && (__FreeBSD_version <= 500014) -#define UPACKED __attribute__ ((packed)) -#else #define UPACKED __packed -#endif typedef struct { uByte bmRequestType; diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 05cf07c..0ad9080 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -61,11 +61,7 @@ __FBSDID("$FreeBSD$"); #endif #include <sys/tty.h> #include <sys/file.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> -#else -#include <sys/select.h> -#endif #include <sys/proc.h> #include <sys/poll.h> #include <sys/conf.h> @@ -293,9 +289,6 @@ static struct cdevsw uscanner_cdevsw = { .d_write = uscannerwrite, .d_poll = uscannerpoll, .d_name = "uscanner", -#if __FreeBSD_version < 500014 - .d_bmaj -1 -#endif }; #endif diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index bef84f8..885f351 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -51,12 +51,8 @@ __FBSDID("$FreeBSD$"); #if defined(__FreeBSD__) #include <sys/bus.h> #include <sys/ioccom.h> -#if __FreeBSD_version >= 500014 #include <sys/selinfo.h> #else -#include <sys/select.h> -#endif -#else #include <sys/ioctl.h> #include <sys/device.h> #endif |