PERFORCE change 130501 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Sat Dec 8 05:54:43 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=130501
Change 130501 by hselasky at hselasky_laptop001 on 2007/12/08 13:54:21
This commit is device side related.
o Remove UE_DIR_SID hence we now have two callbacks
in the USB config structure. One for the USB device side
and one for the USB host side. Which callback to use is
selected depending on the "usb_mode" variable.
o Most parts of the change was scripted according to:
[ -f src/$F ] && (cat src/$F | sed -e "s/[.]callback =/.cb[USB_MODE_HOST] =/g" > temp) && ((
diff -b -u src/$F temp > /dev/null) || (cat temp > src/$F))
o New enum USB_MODE_MAX which gives the maximum
number of USB modes.
Affected files ...
.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#27 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#39 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#41 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#46 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/uark.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/ugensa.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/uhub.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/uipaq.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/umoscom.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#23 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#70 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#64 edit
.. //depot/projects/usb/src/sys/dev/usb/uscanner.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#32 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#20 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#16 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#27 (text) ====
@@ -173,7 +173,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &atausb_t_bbb_reset1_callback,
+ .cb[USB_MODE_HOST] = &atausb_t_bbb_reset1_callback,
.timeout = 5000, /* 5 seconds */
.interval = 500, /* 500 milliseconds */
},
@@ -184,7 +184,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &atausb_t_bbb_reset2_callback,
+ .cb[USB_MODE_HOST] = &atausb_t_bbb_reset2_callback,
.timeout = 5000, /* 5 seconds */
.interval = 50, /* 50 milliseconds */
},
@@ -195,7 +195,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &atausb_t_bbb_reset3_callback,
+ .cb[USB_MODE_HOST] = &atausb_t_bbb_reset3_callback,
.timeout = 5000, /* 5 seconds */
.interval = 50, /* 50 milliseconds */
},
@@ -206,7 +206,7 @@
.direction = UE_DIR_OUT,
.bufsize = sizeof(struct bbb_cbw),
.flags = {},
- .callback = &atausb_t_bbb_command_callback,
+ .cb[USB_MODE_HOST] = &atausb_t_bbb_command_callback,
.timeout = 5000, /* 5 seconds */
},
@@ -216,7 +216,7 @@
.direction = UE_DIR_IN,
.bufsize = ATAUSB_BULK_SIZE,
.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
- .callback = &atausb_t_bbb_data_read_callback,
+ .cb[USB_MODE_HOST] = &atausb_t_bbb_data_read_callback,
.timeout = 0, /* overwritten later */
},
@@ -226,7 +226,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &atausb_t_bbb_data_rd_cs_callback,
+ .cb[USB_MODE_HOST] = &atausb_t_bbb_data_rd_cs_callback,
.timeout = 5000, /* 5 seconds */
},
@@ -236,7 +236,7 @@
.direction = UE_DIR_OUT,
.bufsize = ATAUSB_BULK_SIZE,
.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
- .callback = &atausb_t_bbb_data_write_callback,
+ .cb[USB_MODE_HOST] = &atausb_t_bbb_data_write_callback,
.timeout = 0, /* overwritten later */
},
@@ -246,7 +246,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &atausb_t_bbb_data_wr_cs_callback,
+ .cb[USB_MODE_HOST] = &atausb_t_bbb_data_wr_cs_callback,
.timeout = 5000, /* 5 seconds */
},
@@ -256,7 +256,7 @@
.direction = UE_DIR_IN,
.bufsize = sizeof(struct bbb_csw),
.flags = {.short_xfer_ok = 1,},
- .callback = &atausb_t_bbb_status_callback,
+ .cb[USB_MODE_HOST] = &atausb_t_bbb_status_callback,
.timeout = 5000, /* ms */
},
};
==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#26 (text+ko) ====
@@ -466,7 +466,7 @@
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = UAUDIO_NFRAMES,
.flags = {.short_xfer_ok = 1,},
- .callback = &uaudio_chan_record_callback,
+ .cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
},
[1] = {
@@ -476,7 +476,7 @@
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = UAUDIO_NFRAMES,
.flags = {.short_xfer_ok = 1,},
- .callback = &uaudio_chan_record_callback,
+ .cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
},
};
@@ -489,7 +489,7 @@
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = (UAUDIO_NFRAMES * 8),
.flags = {.short_xfer_ok = 1,},
- .callback = &uaudio_chan_record_callback,
+ .cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
},
[1] = {
@@ -499,7 +499,7 @@
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = (UAUDIO_NFRAMES * 8),
.flags = {.short_xfer_ok = 1,},
- .callback = &uaudio_chan_record_callback,
+ .cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
},
};
@@ -512,7 +512,7 @@
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = UAUDIO_NFRAMES,
.flags = {.short_xfer_ok = 1,},
- .callback = &uaudio_chan_play_callback,
+ .cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
},
[1] = {
@@ -522,7 +522,7 @@
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = UAUDIO_NFRAMES,
.flags = {.short_xfer_ok = 1,},
- .callback = &uaudio_chan_play_callback,
+ .cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
},
};
@@ -535,7 +535,7 @@
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = (UAUDIO_NFRAMES * 8),
.flags = {.short_xfer_ok = 1,},
- .callback = &uaudio_chan_play_callback,
+ .cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
},
[1] = {
@@ -545,7 +545,7 @@
.bufsize = 0, /* use "wMaxPacketSize * frames" */
.frames = (UAUDIO_NFRAMES * 8),
.flags = {.short_xfer_ok = 1,},
- .callback = &uaudio_chan_play_callback,
+ .cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
},
};
@@ -556,7 +556,7 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = (sizeof(usb_device_request_t) + 4),
- .callback = &uaudio_mixer_write_cfg_callback,
+ .cb[USB_MODE_HOST] = &uaudio_mixer_write_cfg_callback,
.timeout = 1000, /* 1 second */
},
};
@@ -589,7 +589,7 @@
.direction = UE_DIR_OUT,
.bufsize = UMIDI_BULK_SIZE,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &umidi_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &umidi_bulk_write_callback,
},
[1] = {
@@ -598,7 +598,7 @@
.direction = UE_DIR_IN,
.bufsize = UMIDI_BULK_SIZE,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &umidi_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &umidi_bulk_read_callback,
},
[2] = {
@@ -607,7 +607,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &umidi_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &umidi_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -618,7 +618,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &umidi_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &umidi_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#39 (text+ko) ====
@@ -288,7 +288,7 @@
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 2),
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &aue_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &aue_bulk_write_callback,
.timeout = 10000, /* 10 seconds */
},
@@ -298,7 +298,7 @@
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN),
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &aue_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &aue_bulk_read_callback,
},
[2] = {
@@ -307,7 +307,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &aue_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &aue_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -318,7 +318,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &aue_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &aue_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -329,7 +329,7 @@
.direction = UE_DIR_IN,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = 0, /* use wMaxPacketSize */
- .callback = &aue_intr_callback,
+ .cb[USB_MODE_HOST] = &aue_intr_callback,
},
[5] = {
@@ -338,7 +338,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &aue_intr_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &aue_intr_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#41 (text+ko) ====
@@ -236,7 +236,7 @@
.direction = UE_DIR_OUT,
.bufsize = AXE_BULK_BUF_SIZE,
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &axe_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &axe_bulk_write_callback,
.timeout = 10000, /* 10 seconds */
},
@@ -249,7 +249,7 @@
#endif
.bufsize = MCLBYTES,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &axe_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &axe_bulk_read_callback,
.timeout = 0, /* no timeout */
},
@@ -259,7 +259,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &axe_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &axe_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -270,7 +270,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &axe_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &axe_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -281,7 +281,7 @@
.direction = UE_DIR_IN,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = 0, /* use wMaxPacketSize */
- .callback = &axe_intr_callback,
+ .cb[USB_MODE_HOST] = &axe_intr_callback,
},
[5] = {
@@ -290,7 +290,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &axe_intr_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &axe_intr_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#31 (text+ko) ====
@@ -113,7 +113,7 @@
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 4),
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &cdce_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &cdce_bulk_write_callback,
.timeout = 10000, /* 10 seconds */
},
@@ -123,7 +123,7 @@
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 4),
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &cdce_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &cdce_bulk_read_callback,
},
[2] = {
@@ -132,7 +132,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &cdce_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &cdce_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -143,7 +143,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &cdce_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &cdce_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#35 (text+ko) ====
@@ -169,7 +169,7 @@
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 2),
.flags = {.pipe_bof = 1,},
- .callback = &cue_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &cue_bulk_write_callback,
.timeout = 10000, /* 10 seconds */
},
@@ -179,7 +179,7 @@
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 2),
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &cue_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &cue_bulk_read_callback,
},
[2] = {
@@ -188,7 +188,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &cue_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &cue_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -199,7 +199,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &cue_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &cue_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#37 (text+ko) ====
@@ -203,7 +203,7 @@
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 2 + 64),
.flags = {.pipe_bof = 1,},
- .callback = &kue_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &kue_bulk_write_callback,
.timeout = 10000, /* 10 seconds */
},
@@ -213,7 +213,7 @@
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 2),
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &kue_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &kue_bulk_read_callback,
.timeout = 0, /* no timeout */
},
@@ -223,7 +223,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &kue_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &kue_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -234,7 +234,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &kue_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &kue_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#35 (text+ko) ====
@@ -216,7 +216,7 @@
.direction = UE_DIR_OUT,
.bufsize = MCLBYTES,
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &rue_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &rue_bulk_write_callback,
.timeout = 10000, /* 10 seconds */
},
@@ -226,7 +226,7 @@
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 4),
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &rue_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &rue_bulk_read_callback,
.timeout = 0, /* no timeout */
},
@@ -236,7 +236,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &rue_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &rue_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -247,7 +247,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &rue_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &rue_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -258,7 +258,7 @@
.direction = UE_DIR_IN,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = 0, /* use wMaxPacketSize */
- .callback = &rue_intr_callback,
+ .cb[USB_MODE_HOST] = &rue_intr_callback,
},
[5] = {
@@ -267,7 +267,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &rue_intr_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &rue_intr_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#22 (text+ko) ====
@@ -378,7 +378,7 @@
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + RT2573_TX_DESC_SIZE + 8),
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &rum_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &rum_bulk_write_callback,
.timeout = 5000, /* ms */
},
@@ -388,7 +388,7 @@
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + RT2573_RX_DESC_SIZE),
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &rum_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &rum_bulk_read_callback,
},
[2] = {
@@ -396,7 +396,7 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .callback = &rum_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &rum_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -406,7 +406,7 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .callback = &rum_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &rum_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#37 (text+ko) ====
@@ -162,7 +162,7 @@
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + 2),
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &udav_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &udav_bulk_write_callback,
.timeout = 10000, /* 10 seconds */
},
@@ -172,7 +172,7 @@
.direction = UE_DIR_IN,
.bufsize = (MCLBYTES + 3),
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &udav_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &udav_bulk_read_callback,
.timeout = 0, /* no timeout */
},
@@ -182,7 +182,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &udav_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &udav_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -193,7 +193,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &udav_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &udav_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -204,7 +204,7 @@
.direction = UE_DIR_IN,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = 0, /* use wMaxPacketSize */
- .callback = &udav_intr_callback,
+ .cb[USB_MODE_HOST] = &udav_intr_callback,
},
[5] = {
@@ -213,7 +213,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &udav_intr_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &udav_intr_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#46 (text+ko) ====
@@ -437,7 +437,7 @@
.direction = UE_DIR_OUT,
.bufsize = (RAL_FRAME_SIZE + RAL_TX_DESC_SIZE + 4),
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &ural_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &ural_bulk_write_callback,
.timeout = 5000, /* ms */
},
@@ -447,7 +447,7 @@
.direction = UE_DIR_IN,
.bufsize = (RAL_FRAME_SIZE + RAL_RX_DESC_SIZE),
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &ural_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &ural_bulk_read_callback,
},
[2] = {
@@ -455,7 +455,7 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .callback = &ural_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &ural_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -465,7 +465,7 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .callback = &ural_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &ural_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#26 (text+ko) ====
@@ -237,7 +237,7 @@
.direction = UE_DIR_OUT,
.bufsize = (MCLBYTES + sizeof(struct zyd_controlsetformat) + 1),
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &zyd_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &zyd_bulk_write_callback,
.index = 0,
.timeout = 10000, /* 10 seconds */
},
@@ -248,7 +248,7 @@
.direction = UE_DIR_IN,
.bufsize = (MAX(MCLBYTES, 2312) + sizeof(struct zyd_rxleninfoapp)),
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &zyd_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &zyd_bulk_read_callback,
.index = 0,
},
@@ -258,7 +258,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &zyd_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &zyd_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -269,7 +269,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &zyd_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &zyd_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -280,7 +280,7 @@
.direction = UE_DIR_OUT,
.bufsize = ZYD_INTR_BUF_SIZE,
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &zyd_intr_write_callback,
+ .cb[USB_MODE_HOST] = &zyd_intr_write_callback,
.timeout = 1000, /* 1 second */
.index = 1,
},
@@ -291,7 +291,7 @@
.direction = UE_DIR_IN,
.bufsize = ZYD_INTR_BUF_SIZE,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &zyd_intr_read_callback,
+ .cb[USB_MODE_HOST] = &zyd_intr_read_callback,
.timeout = 1000, /* 1 second */
.index = 1,
},
@@ -302,7 +302,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &zyd_intr_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &zyd_intr_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -313,7 +313,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &zyd_intr_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &zyd_intr_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/uark.c#15 (text+ko) ====
@@ -108,7 +108,7 @@
.direction = UE_DIR_OUT,
.bufsize = UARK_BUF_SIZE,
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &uark_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &uark_bulk_write_callback,
},
[1] = {
@@ -117,7 +117,7 @@
.direction = UE_DIR_IN,
.bufsize = UARK_BUF_SIZE,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &uark_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &uark_bulk_read_callback,
},
[2] = {
@@ -126,7 +126,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &uark_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &uark_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -137,7 +137,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &uark_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &uark_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#32 (text+ko) ====
@@ -195,7 +195,7 @@
.direction = UE_DIR_OUT,
.bufsize = UBSA_BSIZE, /* bytes */
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &ubsa_write_callback,
+ .cb[USB_MODE_HOST] = &ubsa_write_callback,
},
[1] = {
@@ -204,7 +204,7 @@
.direction = UE_DIR_IN,
.bufsize = UBSA_BSIZE, /* bytes */
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &ubsa_read_callback,
+ .cb[USB_MODE_HOST] = &ubsa_read_callback,
},
[2] = {
@@ -212,7 +212,7 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .callback = &ubsa_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &ubsa_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -222,7 +222,7 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .callback = &ubsa_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &ubsa_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -233,7 +233,7 @@
.direction = UE_DIR_IN,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = 0, /* use wMaxPacketSize */
- .callback = &ubsa_intr_callback,
+ .cb[USB_MODE_HOST] = &ubsa_intr_callback,
},
[5] = {
@@ -241,7 +241,7 @@
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
- .callback = &ubsa_intr_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &ubsa_intr_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/ubser.c#24 (text+ko) ====
@@ -164,7 +164,7 @@
.direction = UE_DIR_OUT,
.bufsize = 0, /* use wMaxPacketSize */
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &ubser_write_callback,
+ .cb[USB_MODE_HOST] = &ubser_write_callback,
},
[UBSER_TR_DT_READ] = {
@@ -173,7 +173,7 @@
.direction = UE_DIR_IN,
.bufsize = 0, /* use wMaxPacketSize */
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &ubser_read_callback,
+ .cb[USB_MODE_HOST] = &ubser_read_callback,
},
[UBSER_TR_CS_WRITE] = {
@@ -182,7 +182,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &ubser_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &ubser_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -193,7 +193,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &ubser_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &ubser_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#26 (text+ko) ====
@@ -116,7 +116,7 @@
.direction = UE_DIR_ANY,
.bufsize = (sizeof(usb_device_request_t) + UCYCOM_MAX_IOLEN),
.flags = {},
- .callback = &ucycom_ctrl_write_callback,
+ .cb[USB_MODE_HOST] = &ucycom_ctrl_write_callback,
.timeout = 1000, /* 1 second */
},
@@ -126,7 +126,7 @@
.direction = UE_DIR_IN,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = UCYCOM_MAX_IOLEN,
- .callback = &ucycom_intr_read_callback,
+ .cb[USB_MODE_HOST] = &ucycom_intr_read_callback,
},
[2] = {
@@ -135,7 +135,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &ucycom_intr_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &ucycom_intr_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/udbp.c#20 (text+ko) ====
@@ -197,7 +197,7 @@
.direction = UE_DIR_OUT,
.bufsize = UDBP_BUFFERSIZE,
.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .callback = &udbp_bulk_write_callback,
+ .cb[USB_MODE_HOST] = &udbp_bulk_write_callback,
.timeout = UDBP_TIMEOUT,
},
@@ -207,7 +207,7 @@
.direction = UE_DIR_IN,
.bufsize = UDBP_BUFFERSIZE,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .callback = &udbp_bulk_read_callback,
+ .cb[USB_MODE_HOST] = &udbp_bulk_read_callback,
},
[UDBP_T_WR_CS] = {
@@ -216,7 +216,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &udbp_bulk_write_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &udbp_bulk_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -227,7 +227,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &udbp_bulk_read_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &udbp_bulk_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#33 (text+ko) ====
@@ -220,7 +220,7 @@
.direction = UE_DIR_IN,
.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
.bufsize = sizeof(usb_cdc_notification_t),
- .callback = &ufoma_intr_callback,
+ .cb[USB_MODE_HOST] = &ufoma_intr_callback,
},
[1] = {
@@ -229,7 +229,7 @@
.direction = UE_DIR_ANY,
.bufsize = sizeof(usb_device_request_t),
.flags = {},
- .callback = &ufoma_intr_clear_stall_callback,
+ .cb[USB_MODE_HOST] = &ufoma_intr_clear_stall_callback,
.timeout = 1000, /* 1 second */
.interval = 50, /* 50ms */
},
@@ -240,7 +240,7 @@
.direction = UE_DIR_ANY,
.bufsize = (sizeof(usb_device_request_t) + UFOMA_CMD_BUF_SIZE),
.flags = {.short_xfer_ok = 1,},
- .callback = &ufoma_ctrl_read_callback,
+ .cb[USB_MODE_HOST] = &ufoma_ctrl_read_callback,
.timeout = 1000, /* 1 second */
},
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list