Date: Wed, 9 Jan 2008 22:08:16 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 132922 for review Message-ID: <200801092208.m09M8GDo054455@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=132922 Change 132922 by hselasky@hselasky_laptop001 on 2008/01/09 22:07:54 Final follow up commit to - make "bufsize", "frames" and "interval" mode specific. At the moment most USB drivers only support Host Mode so updating them can be done using a "sed" script: [ -f src/$F ] && ( cat src/$F | sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)bufsize/&.mh.bufsize/g" | sed -E "s/\.bufsize.mh.bufsize/.mh.bufsize/g" | sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)frames/&.mh.frames/g" | sed -E "s/\.frames.mh.frames/.mh.frames/g" | sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)interval/&.mh.interval/g" | sed -E "s/\.interval.mh.interval/.mh.interval/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)) Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#33 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#44 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#46 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#52 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#14 edit .. //depot/projects/usb/src/sys/dev/usb/uark.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/uhub.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#43 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#37 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#26 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#33 (text) ==== @@ -171,40 +171,40 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_reset1_callback, .mh.timeout = 5000, /* 5 seconds */ - .interval = 500, /* 500 milliseconds */ + .mh.interval = 500, /* 500 milliseconds */ }, [ATAUSB_T_BBB_RESET2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_reset2_callback, .mh.timeout = 5000, /* 5 seconds */ - .interval = 50, /* 50 milliseconds */ + .mh.interval = 50, /* 50 milliseconds */ }, [ATAUSB_T_BBB_RESET3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_reset3_callback, .mh.timeout = 5000, /* 5 seconds */ - .interval = 50, /* 50 milliseconds */ + .mh.interval = 50, /* 50 milliseconds */ }, [ATAUSB_T_BBB_COMMAND] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = sizeof(struct bbb_cbw), + .mh.bufsize = sizeof(struct bbb_cbw), .mh.flags = {}, .mh.callback = &atausb_t_bbb_command_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -214,7 +214,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = ATAUSB_BULK_SIZE, + .mh.bufsize = ATAUSB_BULK_SIZE, .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, .mh.callback = &atausb_t_bbb_data_read_callback, .mh.timeout = 0, /* overwritten later */ @@ -224,7 +224,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_data_rd_cs_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -234,7 +234,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = ATAUSB_BULK_SIZE, + .mh.bufsize = ATAUSB_BULK_SIZE, .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, .mh.callback = &atausb_t_bbb_data_write_callback, .mh.timeout = 0, /* overwritten later */ @@ -244,7 +244,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_data_wr_cs_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -254,7 +254,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = sizeof(struct bbb_csw), + .mh.bufsize = sizeof(struct bbb_csw), .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#32 (text+ko) ==== @@ -463,8 +463,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = UAUDIO_NFRAMES, + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = UAUDIO_NFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, @@ -473,8 +473,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = UAUDIO_NFRAMES, + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = UAUDIO_NFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, @@ -486,8 +486,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = (UAUDIO_NFRAMES * 8), + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = (UAUDIO_NFRAMES * 8), .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, @@ -496,8 +496,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = (UAUDIO_NFRAMES * 8), + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = (UAUDIO_NFRAMES * 8), .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, @@ -509,8 +509,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = UAUDIO_NFRAMES, + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = UAUDIO_NFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, @@ -519,8 +519,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = UAUDIO_NFRAMES, + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = UAUDIO_NFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, @@ -532,8 +532,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = (UAUDIO_NFRAMES * 8), + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = (UAUDIO_NFRAMES * 8), .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, @@ -542,8 +542,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = (UAUDIO_NFRAMES * 8), + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = (UAUDIO_NFRAMES * 8), .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, @@ -555,7 +555,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = (sizeof(usb_device_request_t) + 4), + .mh.bufsize = (sizeof(usb_device_request_t) + 4), .mh.callback = &uaudio_mixer_write_cfg_callback, .mh.timeout = 1000, /* 1 second */ }, @@ -587,7 +587,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = UMIDI_BULK_SIZE, + .mh.bufsize = UMIDI_BULK_SIZE, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &umidi_bulk_write_callback, }, @@ -596,7 +596,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = UMIDI_BULK_SIZE, + .mh.bufsize = UMIDI_BULK_SIZE, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &umidi_bulk_read_callback, }, @@ -605,22 +605,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &umidi_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &umidi_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#44 (text+ko) ==== @@ -286,7 +286,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &aue_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -296,7 +296,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN), + .mh.bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &aue_bulk_read_callback, }, @@ -305,22 +305,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &aue_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &aue_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -328,7 +328,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &aue_intr_callback, }, @@ -336,11 +336,11 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &aue_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#46 (text+ko) ==== @@ -234,7 +234,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = AXE_BULK_BUF_SIZE, + .mh.bufsize = AXE_BULK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &axe_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -247,7 +247,7 @@ #if (MCLBYTES < 2048) #error "(MCLBYTES < 2048)" #endif - .bufsize = MCLBYTES, + .mh.bufsize = MCLBYTES, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &axe_bulk_read_callback, .mh.timeout = 0, /* no timeout */ @@ -257,22 +257,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &axe_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &axe_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -280,7 +280,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &axe_intr_callback, }, @@ -288,11 +288,11 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &axe_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#40 (text+ko) ==== @@ -167,7 +167,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,}, .mh.callback = &cue_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -177,7 +177,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &cue_bulk_read_callback, }, @@ -186,22 +186,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &cue_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &cue_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#42 (text+ko) ==== @@ -201,7 +201,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + 2 + 64), + .mh.bufsize = (MCLBYTES + 2 + 64), .mh.flags = {.pipe_bof = 1,}, .mh.callback = &kue_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -211,7 +211,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &kue_bulk_read_callback, .mh.timeout = 0, /* no timeout */ @@ -221,22 +221,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &kue_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &kue_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#40 (text+ko) ==== @@ -214,7 +214,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = MCLBYTES, + .mh.bufsize = MCLBYTES, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &rue_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -224,7 +224,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 4), + .mh.bufsize = (MCLBYTES + 4), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &rue_bulk_read_callback, .mh.timeout = 0, /* no timeout */ @@ -234,22 +234,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &rue_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &rue_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -257,7 +257,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &rue_intr_callback, }, @@ -265,11 +265,11 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &rue_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#27 (text+ko) ==== @@ -376,7 +376,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + RT2573_TX_DESC_SIZE + 8), + .mh.bufsize = (MCLBYTES + RT2573_TX_DESC_SIZE + 8), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &rum_bulk_write_callback, .mh.timeout = 5000, /* ms */ @@ -386,7 +386,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + RT2573_RX_DESC_SIZE), + .mh.bufsize = (MCLBYTES + RT2573_RX_DESC_SIZE), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &rum_bulk_read_callback, }, @@ -395,20 +395,20 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &rum_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &rum_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#42 (text+ko) ==== @@ -160,7 +160,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &udav_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -170,7 +170,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 3), + .mh.bufsize = (MCLBYTES + 3), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &udav_bulk_read_callback, .mh.timeout = 0, /* no timeout */ @@ -180,22 +180,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &udav_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &udav_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -203,7 +203,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &udav_intr_callback, }, @@ -211,11 +211,11 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &udav_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#52 (text+ko) ==== @@ -368,7 +368,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (RAL_FRAME_SIZE + RAL_TX_DESC_SIZE + 4), + .mh.bufsize = (RAL_FRAME_SIZE + RAL_TX_DESC_SIZE + 4), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &ural_bulk_write_callback, .mh.timeout = 5000, /* ms */ @@ -378,7 +378,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (RAL_FRAME_SIZE + RAL_RX_DESC_SIZE), + .mh.bufsize = (RAL_FRAME_SIZE + RAL_RX_DESC_SIZE), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &ural_bulk_read_callback, }, @@ -387,20 +387,20 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ural_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ural_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#36 (text+ko) ==== @@ -227,7 +227,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = ZYD_MAX_TXBUFSZ, + .mh.bufsize = ZYD_MAX_TXBUFSZ, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &zyd_bulk_write_callback, .ep_index = 0, @@ -238,7 +238,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = ZYX_MAX_RXBUFSZ, + .mh.bufsize = ZYX_MAX_RXBUFSZ, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &zyd_bulk_read_callback, .ep_index = 0, @@ -248,29 +248,29 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &zyd_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [ZYD_TR_BULK_CS_RD] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &zyd_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [ZYD_TR_INTR_DT_WR] = { .type = UE_BULK_INTR, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = sizeof(struct zyd_cmd), + .mh.bufsize = sizeof(struct zyd_cmd), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &zyd_intr_write_callback, .mh.timeout = 1000, /* 1 second */ @@ -281,7 +281,7 @@ .type = UE_BULK_INTR, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = sizeof(struct zyd_cmd), + .mh.bufsize = sizeof(struct zyd_cmd), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &zyd_intr_read_callback, .ep_index = 1, @@ -291,22 +291,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &zyd_intr_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [ZYD_TR_INTR_CS_RD] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &zyd_intr_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#14 (text+ko) ==== @@ -1143,7 +1143,7 @@ void (*cfg_init_hw) (struct zyd_softc *, struct zyd_rf *); void (*cfg_switch_radio) (struct zyd_softc *, uint8_t on); void (*cfg_set_channel) (struct zyd_softc *, struct zyd_rf *, uint8_t); - uint8_t width; + uint8_t width; }; enum { ==== //depot/projects/usb/src/sys/dev/usb/uark.c#20 (text+ko) ==== @@ -106,7 +106,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = UARK_BUF_SIZE, + .mh.bufsize = UARK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &uark_bulk_write_callback, }, @@ -115,7 +115,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = UARK_BUF_SIZE, + .mh.bufsize = UARK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &uark_bulk_read_callback, }, @@ -124,22 +124,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &uark_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &uark_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#37 (text+ko) ==== @@ -193,7 +193,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = UBSA_BSIZE, /* bytes */ + .mh.bufsize = UBSA_BSIZE, /* bytes */ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &ubsa_write_callback, }, @@ -202,7 +202,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = UBSA_BSIZE, /* bytes */ + .mh.bufsize = UBSA_BSIZE, /* bytes */ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &ubsa_read_callback, }, @@ -211,20 +211,20 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ubsa_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ubsa_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -232,7 +232,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &ubsa_intr_callback, }, @@ -240,10 +240,10 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ubsa_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#29 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801092208.m09M8GDo054455>