Finally make the module dependencies work. kern_linker.c now allows

modules to depend on modules in the same file (uhub depends on usb) or
even on themselves (usb on usb, makes the define in usb_port.h a lot
less convoluted).

Use ANSI prototypes.

1 files changed, 9 insertions, 6 deletions

diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 3688aad..0767649 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -64,7 +64,6 @@
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 
-#define USBCORE
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
@@ -128,7 +127,7 @@ d_open_t  usbopen;
 d_close_t usbclose;
 d_read_t usbread;
 d_ioctl_t usbioctl;
-int usbpoll __P((dev_t, int, struct proc *));
+int usbpoll(dev_t, int, struct proc *);
 
 struct cdevsw usb_cdevsw = {
 	/* open */      usbopen,
@@ -148,10 +147,10 @@ struct cdevsw usb_cdevsw = {
 };
 #endif
 
-Static usbd_status usb_discover __P((struct usb_softc *));
+Static usbd_status usb_discover(struct usb_softc *);
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-Static void	usb_create_event_thread __P((void *));
-Static void	usb_event_thread __P((void *));
+Static void	usb_create_event_thread(void *);
+Static void	usb_event_thread(void *);
 #endif
 
 #define USB_MAX_EVENTS 50
@@ -166,7 +165,7 @@ Static struct selinfo usb_selevent;
 Static struct proc *usb_async_proc;  /* process who wants USB SIGIO */
 Static int usb_dev_open = 0;
 
-Static int usb_get_next_event __P((struct usb_event *));
+Static int usb_get_next_event(struct usb_event *);
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 /* Flag to see if we are in the cold boot process. */
@@ -181,6 +180,10 @@ USB_DECLARE_DRIVER_INIT(usb,
 			DEVMETHOD(device_shutdown, bus_generic_shutdown)
 			);
 
+#if defined(__FreeBSD__)
+MODULE_VERSION(usb, 1);
+#endif
+
 USB_MATCH(usb)
 {
 	DPRINTF(("usbd_match\n"));