PERFORCE change 131575 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Tue Dec 25 02:28:53 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=131575
Change 131575 by hselasky at hselasky_laptop001 on 2007/12/25 10:28:24
Make the parameters "timeout" and "flags" in "struct usbd_config"
mode specific. This is for sake of convenience when we are setting
up symmetric USB drivers. The structural changes needed were done
by change 131572, which was mislabeled a style change.
This commit only contains changes done by the following script.
Note that there is an invisible tab and space character inside
the brackets in the "sed" lines.
#!/bin/sh
chmod +x ./src/sys/dev/usb/usb_style.sh
for F in `cat convert_all_files.txt | grep -E ".*[.][cChH]" | grep -v "mixer.[ch]"`
do
[ -f src/$F ] && ( cat src/$F |
sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)cb.USB_MODE_HOST./&.mh.callback/g" |
sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)cb.USB_MODE_DEVICE./&.md.callback/g" |
sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)timeout/&.mh.timeout/g" |
sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)flags/&.mh.flags/g" |
sed -E "s/\.cb.USB_MODE_HOST..mh.callback/.mh.callback/g" |
sed -E "s/\.cb.USB_MODE_DEVICE..md.callback/.md.callback/g" |
sed -E "s/\.timeout.mh.timeout/.mh.timeout/g" |
sed -E "s/\.flags.mh.flags/.mh.flags/g" > temp.c ) && (
./src/sys/dev/usb/usb_style.sh `pwd`/temp.c) && (
(diff -du src/$F temp.c > /dev/null) || (cat temp.c > src/$F)
)
done
Affected files ...
.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#31 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#42 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#44 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#38 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#40 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#38 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#40 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#49 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/uark.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/ugensa.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/uhub.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/uipaq.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#38 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#38 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#41 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#39 edit
.. //depot/projects/usb/src/sys/dev/usb/umoscom.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#85 edit
.. //depot/projects/usb/src/sys/dev/usb/uscanner.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#35 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#24 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#19 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#31 (text) ====
@@ -172,9 +172,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &atausb_t_bbb_reset1_callback,
- .timeout = 5000, /* 5 seconds */
+ .mh.flags = {},
+ .mh.callback = &atausb_t_bbb_reset1_callback,
+ .mh.timeout = 5000, /* 5 seconds */
.interval = 500, /* 500 milliseconds */
},
@@ -183,9 +183,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &atausb_t_bbb_reset2_callback,
- .timeout = 5000, /* 5 seconds */
+ .mh.flags = {},
+ .mh.callback = &atausb_t_bbb_reset2_callback,
+ .mh.timeout = 5000, /* 5 seconds */
.interval = 50, /* 50 milliseconds */
},
@@ -194,9 +194,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &atausb_t_bbb_reset3_callback,
- .timeout = 5000, /* 5 seconds */
+ .mh.flags = {},
+ .mh.callback = &atausb_t_bbb_reset3_callback,
+ .mh.timeout = 5000, /* 5 seconds */
.interval = 50, /* 50 milliseconds */
},
@@ -205,9 +205,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = sizeof(struct bbb_cbw),
- .flags = {},
- .cb[USB_MODE_HOST] = &atausb_t_bbb_command_callback,
- .timeout = 5000, /* 5 seconds */
+ .mh.flags = {},
+ .mh.callback = &atausb_t_bbb_command_callback,
+ .mh.timeout = 5000, /* 5 seconds */
},
[ATAUSB_T_BBB_DATA_READ] = {
@@ -215,9 +215,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = ATAUSB_BULK_SIZE,
- .flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &atausb_t_bbb_data_read_callback,
- .timeout = 0, /* overwritten later */
+ .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
+ .mh.callback = &atausb_t_bbb_data_read_callback,
+ .mh.timeout = 0, /* overwritten later */
},
[ATAUSB_T_BBB_DATA_RD_CS] = {
@@ -225,9 +225,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &atausb_t_bbb_data_rd_cs_callback,
- .timeout = 5000, /* 5 seconds */
+ .mh.flags = {},
+ .mh.callback = &atausb_t_bbb_data_rd_cs_callback,
+ .mh.timeout = 5000, /* 5 seconds */
},
[ATAUSB_T_BBB_DATA_WRITE] = {
@@ -235,9 +235,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = ATAUSB_BULK_SIZE,
- .flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &atausb_t_bbb_data_write_callback,
- .timeout = 0, /* overwritten later */
+ .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
+ .mh.callback = &atausb_t_bbb_data_write_callback,
+ .mh.timeout = 0, /* overwritten later */
},
[ATAUSB_T_BBB_DATA_WR_CS] = {
@@ -245,9 +245,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &atausb_t_bbb_data_wr_cs_callback,
- .timeout = 5000, /* 5 seconds */
+ .mh.flags = {},
+ .mh.callback = &atausb_t_bbb_data_wr_cs_callback,
+ .mh.timeout = 5000, /* 5 seconds */
},
[ATAUSB_T_BBB_STATUS] = {
@@ -255,9 +255,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = sizeof(struct bbb_csw),
- .flags = {.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &atausb_t_bbb_status_callback,
- .timeout = 5000, /* ms */
+ .mh.flags = {.short_xfer_ok = 1,},
+ .mh.callback = &atausb_t_bbb_status_callback,
+ .mh.timeout = 5000, /* ms */
},
};
==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#30 (text+ko) ====
@@ -465,8 +465,8 @@
.direction = UE_DIR_IN,
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = UAUDIO_NFRAMES,
- .flags = {.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
+ .mh.flags = {.short_xfer_ok = 1,},
+ .mh.callback = &uaudio_chan_record_callback,
},
[1] = {
@@ -475,8 +475,8 @@
.direction = UE_DIR_IN,
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = UAUDIO_NFRAMES,
- .flags = {.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
+ .mh.flags = {.short_xfer_ok = 1,},
+ .mh.callback = &uaudio_chan_record_callback,
},
};
@@ -488,8 +488,8 @@
.direction = UE_DIR_IN,
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = (UAUDIO_NFRAMES * 8),
- .flags = {.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
+ .mh.flags = {.short_xfer_ok = 1,},
+ .mh.callback = &uaudio_chan_record_callback,
},
[1] = {
@@ -498,8 +498,8 @@
.direction = UE_DIR_IN,
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = (UAUDIO_NFRAMES * 8),
- .flags = {.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
+ .mh.flags = {.short_xfer_ok = 1,},
+ .mh.callback = &uaudio_chan_record_callback,
},
};
@@ -511,8 +511,8 @@
.direction = UE_DIR_OUT,
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = UAUDIO_NFRAMES,
- .flags = {.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
+ .mh.flags = {.short_xfer_ok = 1,},
+ .mh.callback = &uaudio_chan_play_callback,
},
[1] = {
@@ -521,8 +521,8 @@
.direction = UE_DIR_OUT,
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = UAUDIO_NFRAMES,
- .flags = {.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
+ .mh.flags = {.short_xfer_ok = 1,},
+ .mh.callback = &uaudio_chan_play_callback,
},
};
@@ -534,8 +534,8 @@
.direction = UE_DIR_OUT,
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = (UAUDIO_NFRAMES * 8),
- .flags = {.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
+ .mh.flags = {.short_xfer_ok = 1,},
+ .mh.callback = &uaudio_chan_play_callback,
},
[1] = {
@@ -544,8 +544,8 @@
.direction = UE_DIR_OUT,
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = (UAUDIO_NFRAMES * 8),
- .flags = {.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
+ .mh.flags = {.short_xfer_ok = 1,},
+ .mh.callback = &uaudio_chan_play_callback,
},
};
@@ -556,8 +556,8 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = (sizeof(usb_device_request_t) + 4),
- .cb[USB_MODE_HOST] = &uaudio_mixer_write_cfg_callback,
- .timeout = 1000, /* 1 second */
+ .mh.callback = &uaudio_mixer_write_cfg_callback,
+ .mh.timeout = 1000, /* 1 second */
},
};
@@ -588,8 +588,8 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = UMIDI_BULK_SIZE,
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &umidi_bulk_write_callback,
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &umidi_bulk_write_callback,
},
[1] = {
@@ -597,8 +597,8 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = UMIDI_BULK_SIZE,
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &umidi_bulk_read_callback,
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &umidi_bulk_read_callback,
},
[2] = {
@@ -606,9 +606,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &umidi_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &umidi_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -617,9 +617,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &umidi_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &umidi_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#42 (text+ko) ====
@@ -287,9 +287,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 2),
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .cb[USB_MODE_HOST] = &aue_bulk_write_callback,
- .timeout = 10000, /* 10 seconds */
+ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .mh.callback = &aue_bulk_write_callback,
+ .mh.timeout = 10000, /* 10 seconds */
},
[1] = {
@@ -297,8 +297,8 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN),
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &aue_bulk_read_callback,
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &aue_bulk_read_callback,
},
[2] = {
@@ -306,9 +306,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &aue_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &aue_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -317,9 +317,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &aue_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &aue_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -327,9 +327,9 @@
.type = UE_INTERRUPT,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = 0, /* use wMaxPacketSize */
- .cb[USB_MODE_HOST] = &aue_intr_callback,
+ .mh.callback = &aue_intr_callback,
},
[5] = {
@@ -337,9 +337,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &aue_intr_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &aue_intr_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#44 (text+ko) ====
@@ -235,9 +235,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = AXE_BULK_BUF_SIZE,
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .cb[USB_MODE_HOST] = &axe_bulk_write_callback,
- .timeout = 10000, /* 10 seconds */
+ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .mh.callback = &axe_bulk_write_callback,
+ .mh.timeout = 10000, /* 10 seconds */
},
[1] = {
@@ -248,9 +248,9 @@
#error "(MCLBYTES < 2048)"
#endif
.bufsize = MCLBYTES,
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &axe_bulk_read_callback,
- .timeout = 0, /* no timeout */
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &axe_bulk_read_callback,
+ .mh.timeout = 0, /* no timeout */
},
[2] = {
@@ -258,9 +258,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &axe_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &axe_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -269,9 +269,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &axe_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &axe_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -279,9 +279,9 @@
.type = UE_INTERRUPT,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = 0, /* use wMaxPacketSize */
- .cb[USB_MODE_HOST] = &axe_intr_callback,
+ .mh.callback = &axe_intr_callback,
},
[5] = {
@@ -289,9 +289,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &axe_intr_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &axe_intr_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#36 (text+ko) ====
@@ -97,9 +97,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 4),
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .cb[USB_MODE_HOST] = &cdce_bulk_write_callback,
- .timeout = 10000, /* 10 seconds */
+ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .mh.callback = &cdce_bulk_write_callback,
+ .mh.timeout = 10000, /* 10 seconds */
},
[1] = {
@@ -107,8 +107,8 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 4),
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &cdce_bulk_read_callback,
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &cdce_bulk_read_callback,
},
[2] = {
@@ -116,9 +116,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &cdce_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &cdce_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -127,9 +127,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &cdce_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &cdce_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#38 (text+ko) ====
@@ -168,9 +168,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 2),
- .flags = {.pipe_bof = 1,},
- .cb[USB_MODE_HOST] = &cue_bulk_write_callback,
- .timeout = 10000, /* 10 seconds */
+ .mh.flags = {.pipe_bof = 1,},
+ .mh.callback = &cue_bulk_write_callback,
+ .mh.timeout = 10000, /* 10 seconds */
},
[1] = {
@@ -178,8 +178,8 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 2),
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &cue_bulk_read_callback,
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &cue_bulk_read_callback,
},
[2] = {
@@ -187,9 +187,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &cue_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &cue_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -198,9 +198,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &cue_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &cue_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#40 (text+ko) ====
@@ -202,9 +202,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 2 + 64),
- .flags = {.pipe_bof = 1,},
- .cb[USB_MODE_HOST] = &kue_bulk_write_callback,
- .timeout = 10000, /* 10 seconds */
+ .mh.flags = {.pipe_bof = 1,},
+ .mh.callback = &kue_bulk_write_callback,
+ .mh.timeout = 10000, /* 10 seconds */
},
[1] = {
@@ -212,9 +212,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 2),
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &kue_bulk_read_callback,
- .timeout = 0, /* no timeout */
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &kue_bulk_read_callback,
+ .mh.timeout = 0, /* no timeout */
},
[2] = {
@@ -222,9 +222,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &kue_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &kue_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -233,9 +233,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &kue_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &kue_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#38 (text+ko) ====
@@ -215,9 +215,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = MCLBYTES,
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .cb[USB_MODE_HOST] = &rue_bulk_write_callback,
- .timeout = 10000, /* 10 seconds */
+ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .mh.callback = &rue_bulk_write_callback,
+ .mh.timeout = 10000, /* 10 seconds */
},
[1] = {
@@ -225,9 +225,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 4),
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &rue_bulk_read_callback,
- .timeout = 0, /* no timeout */
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &rue_bulk_read_callback,
+ .mh.timeout = 0, /* no timeout */
},
[2] = {
@@ -235,9 +235,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &rue_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &rue_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -246,9 +246,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &rue_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &rue_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -256,9 +256,9 @@
.type = UE_INTERRUPT,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = 0, /* use wMaxPacketSize */
- .cb[USB_MODE_HOST] = &rue_intr_callback,
+ .mh.callback = &rue_intr_callback,
},
[5] = {
@@ -266,9 +266,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &rue_intr_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &rue_intr_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#25 (text+ko) ====
@@ -377,9 +377,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + RT2573_TX_DESC_SIZE + 8),
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .cb[USB_MODE_HOST] = &rum_bulk_write_callback,
- .timeout = 5000, /* ms */
+ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .mh.callback = &rum_bulk_write_callback,
+ .mh.timeout = 5000, /* ms */
},
[1] = {
@@ -387,8 +387,8 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + RT2573_RX_DESC_SIZE),
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &rum_bulk_read_callback,
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &rum_bulk_read_callback,
},
[2] = {
@@ -396,8 +396,8 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .cb[USB_MODE_HOST] = &rum_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.callback = &rum_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -406,8 +406,8 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .cb[USB_MODE_HOST] = &rum_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.callback = &rum_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#40 (text+ko) ====
@@ -161,9 +161,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 2),
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .cb[USB_MODE_HOST] = &udav_bulk_write_callback,
- .timeout = 10000, /* 10 seconds */
+ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .mh.callback = &udav_bulk_write_callback,
+ .mh.timeout = 10000, /* 10 seconds */
},
[1] = {
@@ -171,9 +171,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 3),
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &udav_bulk_read_callback,
- .timeout = 0, /* no timeout */
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &udav_bulk_read_callback,
+ .mh.timeout = 0, /* no timeout */
},
[2] = {
@@ -181,9 +181,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &udav_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &udav_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -192,9 +192,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &udav_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &udav_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -202,9 +202,9 @@
.type = UE_INTERRUPT,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = 0, /* use wMaxPacketSize */
- .cb[USB_MODE_HOST] = &udav_intr_callback,
+ .mh.callback = &udav_intr_callback,
},
[5] = {
@@ -212,9 +212,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &udav_intr_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &udav_intr_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#49 (text+ko) ====
@@ -436,9 +436,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = (RAL_FRAME_SIZE + RAL_TX_DESC_SIZE + 4),
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .cb[USB_MODE_HOST] = &ural_bulk_write_callback,
- .timeout = 5000, /* ms */
+ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .mh.callback = &ural_bulk_write_callback,
+ .mh.timeout = 5000, /* ms */
},
[1] = {
@@ -446,8 +446,8 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = (RAL_FRAME_SIZE + RAL_RX_DESC_SIZE),
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &ural_bulk_read_callback,
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &ural_bulk_read_callback,
},
[2] = {
@@ -455,8 +455,8 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .cb[USB_MODE_HOST] = &ural_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.callback = &ural_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -465,8 +465,8 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .cb[USB_MODE_HOST] = &ural_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.callback = &ural_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
};
==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#29 (text+ko) ====
@@ -236,10 +236,10 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + sizeof(struct zyd_controlsetformat) + 1),
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .cb[USB_MODE_HOST] = &zyd_bulk_write_callback,
+ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .mh.callback = &zyd_bulk_write_callback,
.index = 0,
- .timeout = 10000, /* 10 seconds */
+ .mh.timeout = 10000, /* 10 seconds */
},
[ZYD_TR_BULK_DT_RD] = {
@@ -247,8 +247,8 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = (MAX(MCLBYTES, 2312) + sizeof(struct zyd_rxleninfoapp)),
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &zyd_bulk_read_callback,
+ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+ .mh.callback = &zyd_bulk_read_callback,
.index = 0,
},
@@ -257,9 +257,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &zyd_bulk_write_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &zyd_bulk_write_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -268,9 +268,9 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .flags = {},
- .cb[USB_MODE_HOST] = &zyd_bulk_read_clear_stall_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {},
+ .mh.callback = &zyd_bulk_read_clear_stall_callback,
+ .mh.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -279,9 +279,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.bufsize = ZYD_INTR_BUF_SIZE,
- .flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .cb[USB_MODE_HOST] = &zyd_intr_write_callback,
- .timeout = 1000, /* 1 second */
+ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+ .mh.callback = &zyd_intr_write_callback,
+ .mh.timeout = 1000, /* 1 second */
.index = 1,
},
@@ -290,9 +290,9 @@
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
.bufsize = ZYD_INTR_BUF_SIZE,
- .flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .cb[USB_MODE_HOST] = &zyd_intr_read_callback,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list