svn commit: r213357 - in user/weongyo/usb/sys/dev/usb: . controller input misc net serial storage wlan

Weongyo Jeong weongyo at FreeBSD.org
Sat Oct 2 09:46:01 UTC 2010


Author: weongyo
Date: Sat Oct  2 09:46:00 2010
New Revision: 213357
URL: http://svn.freebsd.org/changeset/base/213357

Log:
  Removes struct usb_xfer_flags and converted to uint32_t flags.

Modified:
  user/weongyo/usb/sys/dev/usb/controller/at91dci.c
  user/weongyo/usb/sys/dev/usb/controller/atmegadci.c
  user/weongyo/usb/sys/dev/usb/controller/avr32dci.c
  user/weongyo/usb/sys/dev/usb/controller/ehci.c
  user/weongyo/usb/sys/dev/usb/controller/musb_otg.c
  user/weongyo/usb/sys/dev/usb/controller/ohci.c
  user/weongyo/usb/sys/dev/usb/controller/uhci.c
  user/weongyo/usb/sys/dev/usb/controller/uss820dci.c
  user/weongyo/usb/sys/dev/usb/input/atp.c
  user/weongyo/usb/sys/dev/usb/input/uhid.c
  user/weongyo/usb/sys/dev/usb/input/ukbd.c
  user/weongyo/usb/sys/dev/usb/input/ums.c
  user/weongyo/usb/sys/dev/usb/misc/udbp.c
  user/weongyo/usb/sys/dev/usb/net/if_aue.c
  user/weongyo/usb/sys/dev/usb/net/if_axe.c
  user/weongyo/usb/sys/dev/usb/net/if_cdce.c
  user/weongyo/usb/sys/dev/usb/net/if_cue.c
  user/weongyo/usb/sys/dev/usb/net/if_kue.c
  user/weongyo/usb/sys/dev/usb/net/if_rue.c
  user/weongyo/usb/sys/dev/usb/net/if_udav.c
  user/weongyo/usb/sys/dev/usb/net/uhso.c
  user/weongyo/usb/sys/dev/usb/serial/u3g.c
  user/weongyo/usb/sys/dev/usb/serial/uark.c
  user/weongyo/usb/sys/dev/usb/serial/ubsa.c
  user/weongyo/usb/sys/dev/usb/serial/ubser.c
  user/weongyo/usb/sys/dev/usb/serial/uchcom.c
  user/weongyo/usb/sys/dev/usb/serial/ucycom.c
  user/weongyo/usb/sys/dev/usb/serial/ufoma.c
  user/weongyo/usb/sys/dev/usb/serial/uftdi.c
  user/weongyo/usb/sys/dev/usb/serial/ugensa.c
  user/weongyo/usb/sys/dev/usb/serial/uipaq.c
  user/weongyo/usb/sys/dev/usb/serial/ulpt.c
  user/weongyo/usb/sys/dev/usb/serial/umct.c
  user/weongyo/usb/sys/dev/usb/serial/umodem.c
  user/weongyo/usb/sys/dev/usb/serial/umoscom.c
  user/weongyo/usb/sys/dev/usb/serial/uplcom.c
  user/weongyo/usb/sys/dev/usb/serial/uslcom.c
  user/weongyo/usb/sys/dev/usb/serial/uvisor.c
  user/weongyo/usb/sys/dev/usb/serial/uvscom.c
  user/weongyo/usb/sys/dev/usb/storage/umass.c
  user/weongyo/usb/sys/dev/usb/storage/urio.c
  user/weongyo/usb/sys/dev/usb/storage/ustorage_fs.c
  user/weongyo/usb/sys/dev/usb/usb_compat_linux.c
  user/weongyo/usb/sys/dev/usb/usb_core.h
  user/weongyo/usb/sys/dev/usb/usb_generic.c
  user/weongyo/usb/sys/dev/usb/usb_handle_request.c
  user/weongyo/usb/sys/dev/usb/usb_hub.c
  user/weongyo/usb/sys/dev/usb/usb_msctest.c
  user/weongyo/usb/sys/dev/usb/usb_request.c
  user/weongyo/usb/sys/dev/usb/usb_transfer.c
  user/weongyo/usb/sys/dev/usb/usbdi.h
  user/weongyo/usb/sys/dev/usb/wlan/if_rum.c
  user/weongyo/usb/sys/dev/usb/wlan/if_run.c
  user/weongyo/usb/sys/dev/usb/wlan/if_uath.c
  user/weongyo/usb/sys/dev/usb/wlan/if_upgt.c
  user/weongyo/usb/sys/dev/usb/wlan/if_ural.c
  user/weongyo/usb/sys/dev/usb/wlan/if_urtw.c
  user/weongyo/usb/sys/dev/usb/wlan/if_zyd.c

Modified: user/weongyo/usb/sys/dev/usb/controller/at91dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/at91dci.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/controller/at91dci.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -929,7 +929,10 @@ at91dci_setup_standard_chain(struct usb_
 
 		} else {
 			/* regular data transfer */
-			temp.short_pkt = (xfer->flags.force_short_xfer) ? 0 : 1;
+			if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
+				temp.short_pkt = 0;
+			else
+				temp.short_pkt = 1;
 		}
 
 		at91dci_setup_standard_chain_sub(&temp);

Modified: user/weongyo/usb/sys/dev/usb/controller/atmegadci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/atmegadci.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/controller/atmegadci.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -842,7 +842,10 @@ atmegadci_setup_standard_chain(struct us
 
 		} else {
 			/* regular data transfer */
-			temp.short_pkt = (xfer->flags.force_short_xfer) ? 0 : 1;
+			if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
+				temp.short_pkt = 0;
+			else
+				temp.short_pkt = 1;
 		}
 
 		atmegadci_setup_standard_chain_sub(&temp);

Modified: user/weongyo/usb/sys/dev/usb/controller/avr32dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/avr32dci.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/controller/avr32dci.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -813,7 +813,10 @@ avr32dci_setup_standard_chain(struct usb
 
 		} else {
 			/* regular data transfer */
-			temp.short_pkt = (xfer->flags.force_short_xfer) ? 0 : 1;
+			if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
+				temp.short_pkt = 0;
+			else
+				temp.short_pkt = 1;
 		}
 
 		avr32dci_setup_standard_chain_sub(&temp);

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -1860,7 +1860,10 @@ ehci_setup_standard_chain(struct usb_xfe
 
 		} else {
 			/* regular data transfer */
-			temp.shortpkt = (xfer->flags.force_short_xfer) ? 0 : 1;
+			if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
+				temp.shortpkt = 0;
+			else
+				temp.shortpkt = 1;
 		}
 
 		/* set endpoint direction */
@@ -3425,8 +3428,9 @@ ehci_xfer_setup(struct usb_setup_params 
 		 * For the remainder of an USB transfer modulo
 		 * "max_data_length" we need two USB transfer descriptors.
 		 * One to transfer the remaining data and one to finalise
-		 * with a zero length packet in case the "force_short_xfer"
-		 * flag is set. We only need two USB transfer descriptors in
+		 * with a zero length packet in case
+		 * the USBD_FORCE_SHORT_XFER flag is set.
+		 * We only need two USB transfer descriptors in
 		 * the case where the transfer length of the first one is a
 		 * factor of "max_frame_size". The rest of the needed USB
 		 * transfer descriptors is given by the buffer size divided

Modified: user/weongyo/usb/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/musb_otg.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/controller/musb_otg.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -1164,7 +1164,10 @@ musbotg_setup_standard_chain(struct usb_
 
 		} else {
 			/* regular data transfer */
-			temp.short_pkt = (xfer->flags.force_short_xfer) ? 0 : 1;
+			if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
+				temp.short_pkt = 0;
+			else
+				temp.short_pkt = 1;
 		}
 
 		musbotg_setup_standard_chain_sub(&temp);

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -1476,7 +1476,10 @@ ohci_setup_standard_chain(struct usb_xfe
 
 		} else {
 			/* regular data transfer */
-			temp.shortpkt = (xfer->flags.force_short_xfer) ? 0 : 1;
+			if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
+				temp.shortpkt = 0;
+			else
+				temp.shortpkt = 1;
 		}
 
 		ohci_setup_standard_chain_sub(&temp);

Modified: user/weongyo/usb/sys/dev/usb/controller/uhci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uhci.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/controller/uhci.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -1691,7 +1691,10 @@ uhci_setup_standard_chain(struct usb_xfe
 
 		} else {
 			/* regular data transfer */
-			temp.shortpkt = (xfer->flags.force_short_xfer) ? 0 : 1;
+			if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
+				temp.shortpkt = 0;
+			else
+				temp.shortpkt = 1;
 		}
 
 		/* set endpoint direction */

Modified: user/weongyo/usb/sys/dev/usb/controller/uss820dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uss820dci.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/controller/uss820dci.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -898,7 +898,10 @@ uss820dci_setup_standard_chain(struct us
 
 		} else {
 			/* regular data transfer */
-			temp.short_pkt = (xfer->flags.force_short_xfer) ? 0 : 1;
+			if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
+				temp.short_pkt = 0;
+			else
+				temp.short_pkt = 1;
 		}
 
 		uss820dci_setup_standard_chain_sub(&temp);

Modified: user/weongyo/usb/sys/dev/usb/input/atp.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/atp.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/input/atp.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -1612,10 +1612,7 @@ static const struct usb_config atp_confi
 		.type      = UE_INTERRUPT,
 		.endpoint  = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {
-			.pipe_bof = 1,
-			.short_xfer_ok = 1,
-		},
+		.flags     = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize   = 0, /* use wMaxPacketSize */
 		.callback  = &atp_intr,
 	},

Modified: user/weongyo/usb/sys/dev/usb/input/uhid.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/uhid.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/input/uhid.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -325,7 +325,7 @@ static const struct usb_config uhid_conf
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = UHID_BSIZE,
 		.callback = &uhid_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/input/ukbd.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/ukbd.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/input/ukbd.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -711,7 +711,7 @@ static const struct usb_config ukbd_conf
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &ukbd_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/input/ums.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/ums.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/input/ums.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -345,7 +345,7 @@ static const struct usb_config ums_confi
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &ums_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/misc/udbp.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/misc/udbp.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/misc/udbp.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -205,7 +205,7 @@ static const struct usb_config udbp_conf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UDBP_BUFFERSIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &udbp_bulk_write_callback,
 		.timeout = UDBP_TIMEOUT,
 	},
@@ -215,7 +215,7 @@ static const struct usb_config udbp_conf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UDBP_BUFFERSIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &udbp_bulk_read_callback,
 	},
 

Modified: user/weongyo/usb/sys/dev/usb/net/if_aue.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_aue.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/net/if_aue.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -240,7 +240,7 @@ static const struct usb_config aue_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + 2),
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = aue_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
@@ -250,7 +250,7 @@ static const struct usb_config aue_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN),
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = aue_bulk_read_callback,
 	},
 
@@ -258,7 +258,7 @@ static const struct usb_config aue_confi
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = aue_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/net/if_axe.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_axe.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/net/if_axe.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -213,7 +213,7 @@ static const struct usb_config axe_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = AXE_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = axe_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
@@ -223,7 +223,7 @@ static const struct usb_config axe_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = 16384,	/* bytes */
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = axe_bulk_read_callback,
 		.timeout = 0,	/* no timeout */
 	},
@@ -232,7 +232,7 @@ static const struct usb_config axe_confi
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = axe_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/net/if_cdce.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_cdce.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/net/if_cdce.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -131,7 +131,8 @@ static const struct usb_config cdce_conf
 		.if_index = 0,
 		.frames = CDCE_FRAMES_MAX,
 		.bufsize = (CDCE_FRAMES_MAX * MCLBYTES),
-		.flags = {.pipe_bof = 1,.short_frames_ok = 1,.short_xfer_ok = 1,.ext_buffer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_FRAME_OK |
+		    USBD_SHORT_XFER_OK | USBD_EXT_BUFFER,
 		.callback = cdce_bulk_read_callback,
 		.timeout = 0,	/* no timeout */
 		.usb_mode = USB_MODE_DUAL,	/* both modes */
@@ -144,7 +145,8 @@ static const struct usb_config cdce_conf
 		.if_index = 0,
 		.frames = CDCE_FRAMES_MAX,
 		.bufsize = (CDCE_FRAMES_MAX * MCLBYTES),
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,.ext_buffer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER |
+		    USBD_EXT_BUFFER,
 		.callback = cdce_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 		.usb_mode = USB_MODE_DUAL,	/* both modes */
@@ -156,7 +158,8 @@ static const struct usb_config cdce_conf
 		.direction = UE_DIR_RX,
 		.if_index = 1,
 		.bufsize = CDCE_IND_SIZE_MAX,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.no_pipe_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK |
+		    USBD_NO_PIPE_OK,
 		.callback = cdce_intr_read_callback,
 		.timeout = 0,
 		.usb_mode = USB_MODE_HOST,
@@ -168,7 +171,8 @@ static const struct usb_config cdce_conf
 		.direction = UE_DIR_TX,
 		.if_index = 1,
 		.bufsize = CDCE_IND_SIZE_MAX,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,.no_pipe_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER |
+		    USBD_NO_PIPE_OK,
 		.callback = cdce_intr_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 		.usb_mode = USB_MODE_DEVICE,
@@ -184,7 +188,8 @@ static const struct usb_config cdce_ncm_
 		.if_index = 0,
 		.frames = CDCE_NCM_RX_FRAMES_MAX,
 		.bufsize = (CDCE_NCM_RX_FRAMES_MAX * CDCE_NCM_RX_MAXLEN),
-		.flags = {.pipe_bof = 1,.short_frames_ok = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_FRAME_OK |
+		    USBD_SHORT_XFER_OK,
 		.callback = cdce_ncm_bulk_read_callback,
 		.timeout = 0,	/* no timeout */
 		.usb_mode = USB_MODE_DUAL,	/* both modes */
@@ -197,7 +202,7 @@ static const struct usb_config cdce_ncm_
 		.if_index = 0,
 		.frames = CDCE_NCM_TX_FRAMES_MAX,
 		.bufsize = (CDCE_NCM_TX_FRAMES_MAX * CDCE_NCM_TX_MAXLEN),
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = cdce_ncm_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 		.usb_mode = USB_MODE_DUAL,	/* both modes */
@@ -209,7 +214,8 @@ static const struct usb_config cdce_ncm_
 		.direction = UE_DIR_RX,
 		.if_index = 1,
 		.bufsize = CDCE_IND_SIZE_MAX,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.no_pipe_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK |
+		    USBD_NO_PIPE_OK,
 		.callback = cdce_intr_read_callback,
 		.timeout = 0,
 		.usb_mode = USB_MODE_HOST,
@@ -221,7 +227,8 @@ static const struct usb_config cdce_ncm_
 		.direction = UE_DIR_TX,
 		.if_index = 1,
 		.bufsize = CDCE_IND_SIZE_MAX,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,.no_pipe_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER |
+		    USBD_NO_PIPE_OK,
 		.callback = cdce_intr_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 		.usb_mode = USB_MODE_DEVICE,

Modified: user/weongyo/usb/sys/dev/usb/net/if_cue.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_cue.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/net/if_cue.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -146,7 +146,7 @@ static const struct usb_config cue_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + 2),
-		.flags = {.pipe_bof = 1,},
+		.flags = USBD_PIPE_BOF,
 		.callback = cue_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
@@ -155,7 +155,7 @@ static const struct usb_config cue_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 2),
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = cue_bulk_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/net/if_kue.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_kue.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/net/if_kue.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -184,7 +184,7 @@ static const struct usb_config kue_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + 2 + 64),
-		.flags = {.pipe_bof = 1,},
+		.flags = USBD_PIPE_BOF,
 		.callback = kue_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
@@ -194,7 +194,7 @@ static const struct usb_config kue_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 2),
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = kue_bulk_read_callback,
 		.timeout = 0,	/* no timeout */
 	},

Modified: user/weongyo/usb/sys/dev/usb/net/if_rue.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_rue.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/net/if_rue.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -167,7 +167,7 @@ static const struct usb_config rue_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = MCLBYTES,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = rue_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
@@ -177,7 +177,7 @@ static const struct usb_config rue_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 4),
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = rue_bulk_read_callback,
 		.timeout = 0,	/* no timeout */
 	},
@@ -186,7 +186,7 @@ static const struct usb_config rue_confi
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = rue_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/net/if_udav.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_udav.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/net/if_udav.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -129,7 +129,7 @@ static const struct usb_config udav_conf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + 2),
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = udav_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
@@ -138,7 +138,7 @@ static const struct usb_config udav_conf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 3),
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = udav_bulk_read_callback,
 		.timeout = 0,	/* no timeout */
 	},
@@ -146,7 +146,7 @@ static const struct usb_config udav_conf
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = udav_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/net/uhso.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/uhso.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/net/uhso.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -356,7 +356,7 @@ static const struct usb_config uhso_ctrl
 		.type = UE_CONTROL,
 		.endpoint = 0x00,
 		.direction = UE_DIR_ANY,
-		.flags = { .pipe_bof = 1, .short_xfer_ok = 1 },
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = sizeof(struct usb_device_request) + 1024,
 		.callback = &uhso_mux_read_callback
 	},
@@ -365,7 +365,7 @@ static const struct usb_config uhso_ctrl
 		.type = UE_CONTROL,
 		.endpoint = 0x00,
 		.direction = UE_DIR_ANY,
-		.flags = { .pipe_bof = 1, .force_short_xfer = 1 },
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.bufsize = sizeof(struct usb_device_request) + 1024,
 		.timeout = 1000,
 		.callback = &uhso_mux_write_callback
@@ -378,7 +378,7 @@ static const struct usb_config uhso_mux_
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = { .short_xfer_ok = 1 },
+		.flags = USBD_SHORT_XFER_OK,
 		.bufsize = 0,
 		.callback = &uhso_mux_intr_callback,
 	}
@@ -390,7 +390,7 @@ static const struct usb_config uhso_ifne
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = { .pipe_bof = 1, .short_xfer_ok = 1 },
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = MCLBYTES,
 		.callback = &uhso_ifnet_read_callback
 	},
@@ -398,7 +398,7 @@ static const struct usb_config uhso_ifne
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
-		.flags = { .pipe_bof = 1, .force_short_xfer = 1 },
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.bufsize = MCLBYTES,
 		.timeout = 5 * USB_MS_HZ,
 		.callback = &uhso_ifnet_write_callback
@@ -411,7 +411,7 @@ static const struct usb_config uhso_bs_c
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = { .pipe_bof = 1, .short_xfer_ok = 1 },
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 4096,
 		.callback = &uhso_bs_read_callback
 	},
@@ -420,7 +420,7 @@ static const struct usb_config uhso_bs_c
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
-		.flags = { .pipe_bof = 1, .force_short_xfer = 1 },
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.bufsize = 8192,
 		.callback = &uhso_bs_write_callback
 	},
@@ -429,7 +429,7 @@ static const struct usb_config uhso_bs_c
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = { .short_xfer_ok = 1 },
+		.flags = USBD_SHORT_XFER_OK,
 		.bufsize = 0,
 		.callback = &uhso_bs_intr_callback,
 	}

Modified: user/weongyo/usb/sys/dev/usb/serial/u3g.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/u3g.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/u3g.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -136,7 +136,7 @@ static const struct usb_config u3g_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = U3G_BSIZE,/* bytes */
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &u3g_write_callback,
 	},
 
@@ -145,7 +145,7 @@ static const struct usb_config u3g_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = U3G_BSIZE,/* bytes */
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &u3g_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/serial/uark.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/uark.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/uark.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -121,7 +121,7 @@ static const struct usb_config
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UARK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &uark_bulk_write_callback,
 	},
 
@@ -130,7 +130,7 @@ static const struct usb_config
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UARK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &uark_bulk_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/serial/ubsa.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ubsa.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/ubsa.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -200,7 +200,7 @@ static const struct usb_config ubsa_conf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UBSA_BSIZE,	/* bytes */
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &ubsa_write_callback,
 	},
 
@@ -209,7 +209,7 @@ static const struct usb_config ubsa_conf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UBSA_BSIZE,	/* bytes */
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &ubsa_read_callback,
 	},
 
@@ -217,7 +217,7 @@ static const struct usb_config ubsa_conf
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &ubsa_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/serial/ubser.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ubser.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/ubser.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -168,7 +168,7 @@ static const struct usb_config ubser_con
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = 0,	/* use wMaxPacketSize */
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &ubser_write_callback,
 	},
 
@@ -177,7 +177,7 @@ static const struct usb_config ubser_con
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = 0,	/* use wMaxPacketSize */
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &ubser_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/serial/uchcom.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/uchcom.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/uchcom.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -244,7 +244,7 @@ static const struct usb_config uchcom_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UCHCOM_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &uchcom_write_callback,
 	},
 
@@ -253,7 +253,7 @@ static const struct usb_config uchcom_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UCHCOM_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &uchcom_read_callback,
 	},
 
@@ -261,7 +261,7 @@ static const struct usb_config uchcom_co
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &uchcom_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/serial/ucycom.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ucycom.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/ucycom.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -138,7 +138,7 @@ static const struct usb_config ucycom_co
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = UCYCOM_MAX_IOLEN,
 		.callback = &ucycom_intr_read_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/serial/ufoma.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ufoma.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/ufoma.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -241,7 +241,7 @@ static const struct usb_config
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = sizeof(struct usb_cdc_notification),
 		.callback = &ufoma_intr_callback,
 	},
@@ -251,7 +251,7 @@ static const struct usb_config
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = (sizeof(struct usb_device_request) + UFOMA_CMD_BUF_SIZE),
-		.flags = {.short_xfer_ok = 1,},
+		.flags = USBD_SHORT_XFER_OK,
 		.callback = &ufoma_ctrl_read_callback,
 		.timeout = 1000,	/* 1 second */
 	},
@@ -273,7 +273,7 @@ static const struct usb_config
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UFOMA_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &ufoma_bulk_write_callback,
 	},
 
@@ -282,7 +282,7 @@ static const struct usb_config
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UFOMA_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &ufoma_bulk_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/serial/uftdi.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/uftdi.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/uftdi.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -153,7 +153,7 @@ static const struct usb_config uftdi_con
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UFTDI_OBUFSIZE,
-		.flags = {.pipe_bof = 1,},
+		.flags = USBD_PIPE_BOF,
 		.callback = &uftdi_write_callback,
 	},
 
@@ -162,7 +162,7 @@ static const struct usb_config uftdi_con
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = 0,		/* use wMaxPacketSize */
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &uftdi_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/serial/ugensa.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ugensa.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/ugensa.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -109,7 +109,7 @@ static const struct usb_config ugensa_xf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UGENSA_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &ugensa_bulk_write_callback,
 	},
 
@@ -118,7 +118,7 @@ static const struct usb_config ugensa_xf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UGENSA_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &ugensa_bulk_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/serial/uipaq.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/uipaq.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/uipaq.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -121,7 +121,7 @@ static const struct usb_config uipaq_con
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UIPAQ_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &uipaq_write_callback,
 	},
 
@@ -130,7 +130,7 @@ static const struct usb_config uipaq_con
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UIPAQ_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &uipaq_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/serial/ulpt.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ulpt.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/ulpt.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -351,7 +351,7 @@ static const struct usb_config ulpt_conf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = ULPT_BSIZE,
-		.flags = {.pipe_bof = 1,.proxy_buffer = 1},
+		.flags = USBD_PIPE_BOF | USBD_PROXY_BUFFER,
 		.callback = &ulpt_write_callback,
 	},
 
@@ -360,7 +360,7 @@ static const struct usb_config ulpt_conf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = ULPT_BSIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.proxy_buffer = 1},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK | USBD_PROXY_BUFFER,
 		.callback = &ulpt_read_callback,
 	},
 

Modified: user/weongyo/usb/sys/dev/usb/serial/umct.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/umct.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/umct.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -151,7 +151,7 @@ static const struct usb_config umct_conf
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = 0,	/* use wMaxPacketSize */
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &umct_write_callback,
 	},
 
@@ -159,7 +159,7 @@ static const struct usb_config umct_conf
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &umct_read_callback,
 		.ep_index = 0,		/* first interrupt endpoint */
@@ -169,7 +169,7 @@ static const struct usb_config umct_conf
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &umct_intr_callback,
 		.ep_index = 1,		/* second interrupt endpoint */

Modified: user/weongyo/usb/sys/dev/usb/serial/umodem.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/umodem.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/umodem.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -204,7 +204,7 @@ static const struct usb_config umodem_co
 		.direction = UE_DIR_OUT,
 		.if_index = 0,
 		.bufsize = UMODEM_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &umodem_write_callback,
 	},
 
@@ -214,7 +214,7 @@ static const struct usb_config umodem_co
 		.direction = UE_DIR_IN,
 		.if_index = 0,
 		.bufsize = UMODEM_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &umodem_read_callback,
 	},
 
@@ -223,7 +223,8 @@ static const struct usb_config umodem_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.if_index = 1,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.no_pipe_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK |
+		    USBD_NO_PIPE_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &umodem_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/serial/umoscom.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/umoscom.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/umoscom.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -216,7 +216,7 @@ static const struct usb_config umoscom_c
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UMOSCOM_BUFSIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &umoscom_write_callback,
 	},
 
@@ -225,7 +225,7 @@ static const struct usb_config umoscom_c
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UMOSCOM_BUFSIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &umoscom_read_callback,
 	},
 
@@ -233,7 +233,7 @@ static const struct usb_config umoscom_c
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &umoscom_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/serial/uplcom.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/uplcom.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/uplcom.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -202,7 +202,7 @@ static const struct usb_config uplcom_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UPLCOM_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &uplcom_write_callback,
 		.if_index = 0,
 	},
@@ -212,7 +212,7 @@ static const struct usb_config uplcom_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UPLCOM_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &uplcom_read_callback,
 		.if_index = 0,
 	},
@@ -221,7 +221,7 @@ static const struct usb_config uplcom_co
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &uplcom_intr_callback,
 		.if_index = 1,

Modified: user/weongyo/usb/sys/dev/usb/serial/uslcom.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/uslcom.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/uslcom.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -141,7 +141,7 @@ static const struct usb_config uslcom_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = USLCOM_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &uslcom_write_callback,
 	},
 
@@ -150,7 +150,7 @@ static const struct usb_config uslcom_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = USLCOM_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &uslcom_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/serial/uvisor.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/uvisor.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/uvisor.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -208,7 +208,7 @@ static const struct usb_config uvisor_co
 		.direction = UE_DIR_OUT,
 		.bufsize = UVISOROBUFSIZE * UVISOROFRAMES,
 		.frames = UVISOROFRAMES,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &uvisor_write_callback,
 	},
 
@@ -217,7 +217,7 @@ static const struct usb_config uvisor_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UVISORIBUFSIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &uvisor_read_callback,
 	},
 };

Modified: user/weongyo/usb/sys/dev/usb/serial/uvscom.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/uvscom.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/serial/uvscom.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -191,7 +191,7 @@ static const struct usb_config uvscom_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UVSCOM_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.flags = USBD_PIPE_BOF | USBD_FORCE_SHORT_XFER,
 		.callback = &uvscom_write_callback,
 	},
 
@@ -200,7 +200,7 @@ static const struct usb_config uvscom_co
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UVSCOM_BULK_BUF_SIZE,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.callback = &uvscom_read_callback,
 	},
 
@@ -208,7 +208,7 @@ static const struct usb_config uvscom_co
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.flags = USBD_PIPE_BOF | USBD_SHORT_XFER_OK,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &uvscom_intr_callback,
 	},

Modified: user/weongyo/usb/sys/dev/usb/storage/umass.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/storage/umass.c	Sat Oct  2 08:28:15 2010	(r213356)
+++ user/weongyo/usb/sys/dev/usb/storage/umass.c	Sat Oct  2 09:46:00 2010	(r213357)
@@ -141,9 +141,9 @@ __FBSDID("$FreeBSD$");
 #define UMASS_EXT_BUFFER
 #ifdef UMASS_EXT_BUFFER
 /* this enables loading of virtual buffers into DMA */
-#define	UMASS_USB_FLAGS .ext_buffer=1,
+#define	UMASS_USB_FLAGS	USBD_EXT_BUFFER
 #else
-#define	UMASS_USB_FLAGS
+#define	UMASS_USB_FLAGS 0
 #endif
 
 #ifdef USB_DEBUG
@@ -535,7 +535,8 @@ static struct usb_config umass_bbb_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UMASS_BULK_SIZE,
-		.flags = {.proxy_buffer = 1,.short_xfer_ok = 1, UMASS_USB_FLAGS},
+		.flags = USBD_PROXY_BUFFER | USBD_SHORT_XFER_OK |
+		    UMASS_USB_FLAGS,
 		.callback = &umass_t_bbb_data_read_callback,
 		.timeout = 0,	/* overwritten later */
 	},
@@ -554,7 +555,8 @@ static struct usb_config umass_bbb_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UMASS_BULK_SIZE,
-		.flags = {.proxy_buffer = 1,.short_xfer_ok = 1, UMASS_USB_FLAGS},
+		.flags = USBD_PROXY_BUFFER | USBD_SHORT_XFER_OK |
+		    UMASS_USB_FLAGS,
 		.callback = &umass_t_bbb_data_write_callback,
 		.timeout = 0,	/* overwritten later */
 	},
@@ -573,7 +575,7 @@ static struct usb_config umass_bbb_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = sizeof(umass_bbb_csw_t),
-		.flags = {.short_xfer_ok = 1,},
+		.flags = USBD_SHORT_XFER_OK,
 		.callback = &umass_t_bbb_status_callback,
 		.timeout = 5000,	/* ms */
 	},
@@ -626,7 +628,8 @@ static struct usb_config umass_cbi_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = UMASS_BULK_SIZE,
-		.flags = {.proxy_buffer = 1,.short_xfer_ok = 1, UMASS_USB_FLAGS},
+		.flags = USBD_PROXY_BUFFER | USBD_SHORT_XFER_OK |
+		    UMASS_USB_FLAGS,
 		.callback = &umass_t_cbi_data_read_callback,
 		.timeout = 0,	/* overwritten later */
 	},
@@ -645,7 +648,8 @@ static struct usb_config umass_cbi_confi
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = UMASS_BULK_SIZE,
-		.flags = {.proxy_buffer = 1,.short_xfer_ok = 1, UMASS_USB_FLAGS},
+		.flags = USBD_PROXY_BUFFER | USBD_SHORT_XFER_OK |
+		    UMASS_USB_FLAGS,
 		.callback = &umass_t_cbi_data_write_callback,
 		.timeout = 0,	/* overwritten later */
 	},
@@ -663,7 +667,7 @@ static struct usb_config umass_cbi_confi
 		.type = UE_INTERRUPT,

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-user mailing list