Module Name: src
Committed By: skrll
Date: Wed Dec 3 22:19:50 UTC 2014
Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdivar.h
Log Message:
Rearrange the usbd_bus struct member to match the comments about who
fills them.
To generate a diff of this commit:
cvs rdiff -u -r1.109.2.5 -r1.109.2.6 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/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.109.2.5 src/sys/dev/usb/usbdivar.h:1.109.2.6
--- src/sys/dev/usb/usbdivar.h:1.109.2.5 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/usbdivar.h Wed Dec 3 22:19:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.109.2.5 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: usbdivar.h,v 1.109.2.6 2014/12/03 22:19:50 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -141,8 +141,21 @@ struct usbd_hub {
struct usbd_bus {
/* Filled by HC driver */
void *ub_hcpriv;
+ int ub_revision; /* USB revision */
+#define USBREV_UNKNOWN 0
+#define USBREV_PRE_1_0 1
+#define USBREV_1_0 2
+#define USBREV_1_1 3
+#define USBREV_2_0 4
+#define USBREV_3_0 5
+#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0", "3.0" }
+
const struct usbd_bus_methods *ub_methods;
uint32_t ub_pipesize; /* size of a pipe struct */
+ bool ub_usedma; /* Does this HC support DMA */
+ int ub_dmaflags;
+ bus_dma_tag_t ub_dmatag; /* DMA tag */
+
/* Filled by usb driver */
kmutex_t *ub_lock;
struct usbd_device *ub_roothub;
@@ -152,20 +165,8 @@ struct usbd_bus {
char ub_usepolling;
device_t ub_usbctl;
struct usb_device_stats ub_stats;
- int ub_revision; /* USB revision */
-#define USBREV_UNKNOWN 0
-#define USBREV_PRE_1_0 1
-#define USBREV_1_0 2
-#define USBREV_1_1 3
-#define USBREV_2_0 4
-#define USBREV_3_0 5
-#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0", "3.0" }
void *ub_soft; /* soft interrupt cookie */
-
- bool ub_usedma; /* Does this HC support DMA */
- int ub_dmaflags;
- bus_dma_tag_t ub_dmatag; /* DMA tag */
};
struct usbd_device {
