Module Name: src
Committed By: dyoung
Date: Fri Sep 4 17:53:13 UTC 2009
Modified Files:
src/sys/dev/usb: usbdi.h usbdi_util.h usbdivar.h
Log Message:
Expand <dev/usb/usb_port.h> definitions, and lightly unifdef(1).
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/usb/usbdi.h
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/usbdi_util.h
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/usb/usbdivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdi.h
diff -u src/sys/dev/usb/usbdi.h:1.78 src/sys/dev/usb/usbdi.h:1.79
--- src/sys/dev/usb/usbdi.h:1.78 Sun Aug 16 13:20:40 2009
+++ src/sys/dev/usb/usbdi.h Fri Sep 4 17:53:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.78 2009/08/16 13:20:40 martin Exp $ */
+/* $NetBSD: usbdi.h,v 1.79 2009/09/04 17:53:12 dyoung Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -165,7 +165,7 @@
const char *usbd_errstr(usbd_status);
void usbd_add_dev_event(int, usbd_device_handle);
-void usbd_add_drv_event(int, usbd_device_handle, device_ptr_t);
+void usbd_add_drv_event(int, usbd_device_handle, device_t);
char *usbd_devinfo_alloc(usbd_device_handle, int);
void usbd_devinfo_free(char *);
Index: src/sys/dev/usb/usbdi_util.h
diff -u src/sys/dev/usb/usbdi_util.h:1.39 src/sys/dev/usb/usbdi_util.h:1.40
--- src/sys/dev/usb/usbdi_util.h:1.39 Mon Feb 2 18:15:36 2009
+++ src/sys/dev/usb/usbdi_util.h Fri Sep 4 17:53:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.h,v 1.39 2009/02/02 18:15:36 joerg Exp $ */
+/* $NetBSD: usbdi_util.h,v 1.40 2009/09/04 17:53:12 dyoung Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -63,8 +63,8 @@
usbd_status usbd_get_report(usbd_interface_handle iface, int type, int id,
void *data, int len);
usbd_status usbd_set_idle(usbd_interface_handle iface, int duration,int id);
-usbd_status usbd_read_report_desc(usbd_interface_handle ifc, void **descp,
- int *sizep, usb_malloc_type mem);
+usbd_status usbd_read_report_desc(usbd_interface_handle, void **,
+ int *, struct malloc_type *);
usbd_status usbd_get_config(usbd_device_handle dev, u_int8_t *conf);
usbd_status usbd_get_string_desc(usbd_device_handle dev, int sindex,
int langid,usb_string_descriptor_t *sdesc,
@@ -83,8 +83,8 @@
u_int16_t, u_int32_t, void *,
u_int32_t *, const char *);
-void usb_detach_wait(device_ptr_t);
-void usb_detach_wakeup(device_ptr_t);
+void usb_detach_wait(device_t);
+void usb_detach_wakeup(device_t);
typedef struct {
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.88 src/sys/dev/usb/usbdivar.h:1.89
--- src/sys/dev/usb/usbdivar.h:1.88 Mon Aug 18 18:03:21 2008
+++ src/sys/dev/usb/usbdivar.h Fri Sep 4 17:53:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.88 2008/08/18 18:03:21 kent Exp $ */
+/* $NetBSD: usbdivar.h,v 1.89 2009/09/04 17:53:12 dyoung Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */
/*
@@ -34,7 +34,11 @@
#include <sys/callout.h>
/* From usb_mem.h */
-DECLARE_USB_DMA_T;
+struct usb_dma_block;
+typedef struct {
+ struct usb_dma_block *block;
+ u_int offs;
+} usb_dma_t;
struct usbd_xfer;
struct usbd_pipe;
@@ -213,7 +217,7 @@
#define UXFER_ABORTING 0x01 /* xfer is aborting. */
#define UXFER_ABORTWAIT 0x02 /* abort completion is being awaited. */
- usb_callout_t timeout_handle;
+ struct callout timeout_handle;
};
void usbd_init(void);
@@ -235,10 +239,10 @@
usbd_interface_handle iface,
struct usbd_endpoint *, int,
usbd_pipe_handle *pipe);
-usbd_status usbd_new_device(device_ptr_t, usbd_bus_handle, int, int, int,
- struct usbd_port *);
-usbd_status usbd_reattach_device(device_ptr_t, usbd_device_handle,
- int, const int *);
+usbd_status usbd_new_device(device_t, usbd_bus_handle, int, int, int,
+ struct usbd_port *);
+usbd_status usbd_reattach_device(device_t, usbd_device_handle,
+ int, const int *);
void usbd_remove_device(usbd_device_handle, struct usbd_port *);
int usbd_printBCD(char *, size_t, int);
@@ -247,7 +251,7 @@
usbd_status usb_insert_transfer(usbd_xfer_handle);
void usb_transfer_complete(usbd_xfer_handle);
-void usb_disconnect_port(struct usbd_port *, device_ptr_t);
+void usb_disconnect_port(struct usbd_port *, device_t);
/* Routines from usb.c */
void usb_needs_explore(usbd_device_handle);
