Sync with NetBSD. Too many changes to mention. For now I have skipped

umass.c and ukbd.c as the diffs are a bit hairier.

1 files changed, 42 insertions, 45 deletions

diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 56166c21ac1..1c23d14a27c 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: usbdivar.h,v 1.10 2000/07/04 11:44:26 fgsch Exp $ */
-/*	$NetBSD: usbdivar.h,v 1.55 2000/03/30 00:18:18 augustss Exp $	*/
+/*	$OpenBSD: usbdivar.h,v 1.11 2000/11/08 18:10:39 aaron Exp $ */
+/*	$NetBSD: usbdivar.h,v 1.56 2000/06/01 14:29:03 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $	*/
 
 /*
@@ -55,24 +55,23 @@ struct usbd_endpoint {
 };
 
 struct usbd_bus_methods {
-	usbd_status	      (*open_pipe)__P((struct usbd_pipe *pipe));
-	void		      (*soft_intr)__P((struct usbd_bus *));
-	void		      (*do_poll)__P((struct usbd_bus *));
-	usbd_status	      (*allocm)__P((struct usbd_bus *, usb_dma_t *,
-					    u_int32_t bufsize));
-	void		      (*freem)__P((struct usbd_bus *, usb_dma_t *));
-	struct usbd_xfer *    (*allocx)__P((struct usbd_bus *));
-	void		      (*freex)__P((struct usbd_bus *,
-					   struct usbd_xfer *));
+	usbd_status	      (*open_pipe)(struct usbd_pipe *pipe);
+	void		      (*soft_intr)(struct usbd_bus *);
+	void		      (*do_poll)(struct usbd_bus *);
+	usbd_status	      (*allocm)(struct usbd_bus *, usb_dma_t *,
+					u_int32_t bufsize);
+	void		      (*freem)(struct usbd_bus *, usb_dma_t *);
+	struct usbd_xfer *    (*allocx)(struct usbd_bus *);
+	void		      (*freex)(struct usbd_bus *, struct usbd_xfer *);
 };
 
 struct usbd_pipe_methods {
-	usbd_status	      (*transfer)__P((usbd_xfer_handle xfer));
-	usbd_status	      (*start)__P((usbd_xfer_handle xfer));
-	void		      (*abort)__P((usbd_xfer_handle xfer));
-	void		      (*close)__P((usbd_pipe_handle pipe));
-	void		      (*cleartoggle)__P((usbd_pipe_handle pipe));
-	void		      (*done)__P((usbd_xfer_handle xfer));
+	usbd_status	      (*transfer)(usbd_xfer_handle xfer);
+	usbd_status	      (*start)(usbd_xfer_handle xfer);
+	void		      (*abort)(usbd_xfer_handle xfer);
+	void		      (*close)(usbd_pipe_handle pipe);
+	void		      (*cleartoggle)(usbd_pipe_handle pipe);
+	void		      (*done)(usbd_xfer_handle xfer);
 };
 
 struct usbd_port {
@@ -86,7 +85,7 @@ struct usbd_port {
 };
 
 struct usbd_hub {
-	usbd_status	      (*explore)__P((usbd_device_handle hub));
+	usbd_status	      (*explore)(usbd_device_handle hub);
 	void		       *hubsoftc;
 	usb_hub_descriptor_t	hubdesc;
 	struct usbd_port        ports[1];
@@ -215,37 +214,35 @@ struct usbd_xfer {
 	usb_callout_t		timeout_handle;
 };
 
-void usbd_init __P((void));
-void usbd_finish __P((void));
+void usbd_init(void);
+void usbd_finish(void);
 
 /* Routines from usb_subr.c */
-int		usbctlprint __P((void *, const char *));
-void		usb_delay_ms __P((usbd_bus_handle, u_int));
-void		usbd_devinfo_vp __P((usbd_device_handle, char *, char *));
-usbd_status	usbd_reset_port __P((usbd_device_handle dev,
-				     int port, usb_port_status_t *ps));
-usbd_status	usbd_setup_pipe __P((usbd_device_handle dev,
-				     usbd_interface_handle iface,
-				     struct usbd_endpoint *, int,
-				     usbd_pipe_handle *pipe));
-usbd_status	usbd_new_device __P((device_ptr_t parent, 
-				     usbd_bus_handle bus, int depth,
-				     int lowspeed, int port, 
-				     struct usbd_port *));
-void		usbd_remove_device __P((usbd_device_handle,
-					struct usbd_port *));
-int		usbd_printBCD __P((char *cp, int bcd));
-usbd_status	usbd_fill_iface_data __P((usbd_device_handle dev, 
-					  int i, int a));
-void		usb_free_device __P((usbd_device_handle));
-
-usbd_status	usb_insert_transfer __P((usbd_xfer_handle xfer));
-void		usb_transfer_complete __P((usbd_xfer_handle xfer));
-void		usb_disconnect_port __P((struct usbd_port *up, device_ptr_t));
+int		usbctlprint(void *, const char *);
+void		usb_delay_ms(usbd_bus_handle, u_int);
+void		usbd_devinfo_vp(usbd_device_handle, char *, char *);
+usbd_status	usbd_reset_port(usbd_device_handle dev,
+				int port, usb_port_status_t *ps);
+usbd_status	usbd_setup_pipe(usbd_device_handle dev,
+				usbd_interface_handle iface,
+				struct usbd_endpoint *, int,
+				usbd_pipe_handle *pipe);
+usbd_status	usbd_new_device(device_ptr_t parent, 
+				usbd_bus_handle bus, int depth,
+				int lowspeed, int port, 
+				struct usbd_port *);
+void		usbd_remove_device(usbd_device_handle, struct usbd_port *);
+int		usbd_printBCD(char *cp, int bcd);
+usbd_status	usbd_fill_iface_data(usbd_device_handle dev, int i, int a);
+void		usb_free_device(usbd_device_handle);
+
+usbd_status	usb_insert_transfer(usbd_xfer_handle xfer);
+void		usb_transfer_complete(usbd_xfer_handle xfer);
+void		usb_disconnect_port(struct usbd_port *up, device_ptr_t);
 
 /* Routines from usb.c */
-void		usb_needs_explore __P((usbd_bus_handle));
-void		usb_schedsoftintr __P((struct usbd_bus *));
+void		usb_needs_explore(usbd_bus_handle);
+void		usb_schedsoftintr(struct usbd_bus *);
 
 /*
  * XXX This check is extremely bogus. Bad Bad Bad.