svn commit: r190186 - in head/sys/dev/usb: . misc serial storage
Andrew Thompson
thompsa at FreeBSD.org
Fri Mar 20 15:10:38 PDT 2009
Author: thompsa
Date: Fri Mar 20 22:10:36 2009
New Revision: 190186
URL: http://svn.freebsd.org/changeset/base/190186
Log:
MFp4 //depot/projects/usb at 159517
Fix warnings with the IAR compiler.
Submitted by: Hans Petter Selasky
Modified:
head/sys/dev/usb/misc/udbp.c
head/sys/dev/usb/serial/ucycom.c
head/sys/dev/usb/serial/ufoma.c
head/sys/dev/usb/storage/umass.c
head/sys/dev/usb/storage/urio.c
head/sys/dev/usb/usb_handle_request.c
head/sys/dev/usb/usb_msctest.c
Modified: head/sys/dev/usb/misc/udbp.c
==============================================================================
--- head/sys/dev/usb/misc/udbp.c Fri Mar 20 22:04:33 2009 (r190185)
+++ head/sys/dev/usb/misc/udbp.c Fri Mar 20 22:10:36 2009 (r190186)
@@ -212,7 +212,6 @@ static const struct usb2_config udbp_con
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &udbp_bulk_write_clear_stall_callback,
.mh.timeout = 1000, /* 1 second */
.mh.interval = 50, /* 50ms */
@@ -223,7 +222,6 @@ static const struct usb2_config udbp_con
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &udbp_bulk_read_clear_stall_callback,
.mh.timeout = 1000, /* 1 second */
.mh.interval = 50, /* 50ms */
Modified: head/sys/dev/usb/serial/ucycom.c
==============================================================================
--- head/sys/dev/usb/serial/ucycom.c Fri Mar 20 22:04:33 2009 (r190185)
+++ head/sys/dev/usb/serial/ucycom.c Fri Mar 20 22:10:36 2009 (r190186)
@@ -121,7 +121,6 @@ static const struct usb2_config ucycom_c
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = (sizeof(struct usb2_device_request) + UCYCOM_MAX_IOLEN),
- .mh.flags = {},
.mh.callback = &ucycom_ctrl_write_callback,
.mh.timeout = 1000, /* 1 second */
},
Modified: head/sys/dev/usb/serial/ufoma.c
==============================================================================
--- head/sys/dev/usb/serial/ufoma.c Fri Mar 20 22:04:33 2009 (r190185)
+++ head/sys/dev/usb/serial/ufoma.c Fri Mar 20 22:10:36 2009 (r190186)
@@ -252,7 +252,6 @@ static const struct usb2_config
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = (sizeof(struct usb2_device_request) + 1),
- .mh.flags = {},
.mh.callback = &ufoma_ctrl_write_callback,
.mh.timeout = 1000, /* 1 second */
},
Modified: head/sys/dev/usb/storage/umass.c
==============================================================================
--- head/sys/dev/usb/storage/umass.c Fri Mar 20 22:04:33 2009 (r190185)
+++ head/sys/dev/usb/storage/umass.c Fri Mar 20 22:10:36 2009 (r190186)
@@ -1063,7 +1063,6 @@ struct usb2_config umass_bbb_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_bbb_reset1_callback,
.mh.timeout = 5000, /* 5 seconds */
.mh.interval = 500, /* 500 milliseconds */
@@ -1074,7 +1073,6 @@ struct usb2_config umass_bbb_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_bbb_reset2_callback,
.mh.timeout = 5000, /* 5 seconds */
.mh.interval = 50, /* 50 milliseconds */
@@ -1085,7 +1083,6 @@ struct usb2_config umass_bbb_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_bbb_reset3_callback,
.mh.timeout = 5000, /* 5 seconds */
.mh.interval = 50, /* 50 milliseconds */
@@ -1096,7 +1093,6 @@ struct usb2_config umass_bbb_config[UMAS
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.mh.bufsize = sizeof(umass_bbb_cbw_t),
- .mh.flags = {},
.mh.callback = &umass_t_bbb_command_callback,
.mh.timeout = 5000, /* 5 seconds */
},
@@ -1116,7 +1112,6 @@ struct usb2_config umass_bbb_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_bbb_data_rd_cs_callback,
.mh.timeout = 5000, /* 5 seconds */
},
@@ -1136,7 +1131,6 @@ struct usb2_config umass_bbb_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_bbb_data_wr_cs_callback,
.mh.timeout = 5000, /* 5 seconds */
},
@@ -1160,7 +1154,6 @@ struct usb2_config umass_cbi_config[UMAS
.direction = UE_DIR_ANY,
.mh.bufsize = (sizeof(struct usb2_device_request) +
UMASS_CBI_DIAGNOSTIC_CMDLEN),
- .mh.flags = {},
.mh.callback = &umass_t_cbi_reset1_callback,
.mh.timeout = 5000, /* 5 seconds */
.mh.interval = 500, /* 500 milliseconds */
@@ -1171,7 +1164,6 @@ struct usb2_config umass_cbi_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_cbi_reset2_callback,
.mh.timeout = 5000, /* 5 seconds */
.mh.interval = 50, /* 50 milliseconds */
@@ -1182,7 +1174,6 @@ struct usb2_config umass_cbi_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_cbi_reset3_callback,
.mh.timeout = 5000, /* 5 seconds */
.mh.interval = 50, /* 50 milliseconds */
@@ -1194,7 +1185,6 @@ struct usb2_config umass_cbi_config[UMAS
.direction = UE_DIR_ANY,
.mh.bufsize = (sizeof(struct usb2_device_request) +
UMASS_MAX_CMDLEN),
- .mh.flags = {},
.mh.callback = &umass_t_cbi_command_callback,
.mh.timeout = 5000, /* 5 seconds */
},
@@ -1214,7 +1204,6 @@ struct usb2_config umass_cbi_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_cbi_data_rd_cs_callback,
.mh.timeout = 5000, /* 5 seconds */
},
@@ -1234,7 +1223,6 @@ struct usb2_config umass_cbi_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_cbi_data_wr_cs_callback,
.mh.timeout = 5000, /* 5 seconds */
},
@@ -1254,7 +1242,6 @@ struct usb2_config umass_cbi_config[UMAS
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &umass_t_cbi_reset4_callback,
.mh.timeout = 5000, /* ms */
},
Modified: head/sys/dev/usb/storage/urio.c
==============================================================================
--- head/sys/dev/usb/storage/urio.c Fri Mar 20 22:04:33 2009 (r190185)
+++ head/sys/dev/usb/storage/urio.c Fri Mar 20 22:10:36 2009 (r190186)
@@ -149,7 +149,6 @@ static const struct usb2_config urio_con
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &urio_write_clear_stall_callback,
.mh.timeout = 1000, /* 1 second */
.mh.interval = 50, /* 50ms */
@@ -160,7 +159,6 @@ static const struct usb2_config urio_con
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &urio_read_clear_stall_callback,
.mh.timeout = 1000, /* 1 second */
.mh.interval = 50, /* 50ms */
Modified: head/sys/dev/usb/usb_handle_request.c
==============================================================================
--- head/sys/dev/usb/usb_handle_request.c Fri Mar 20 22:04:33 2009 (r190185)
+++ head/sys/dev/usb/usb_handle_request.c Fri Mar 20 22:10:36 2009 (r190186)
@@ -211,7 +211,7 @@ tr_repeat:
(iface->subdev != NULL) &&
device_is_attached(iface->subdev)) {
#if 0
- DEVMETHOD(usb2_handle_request, NULL); /* dummy */
+ DEVMETHOD(usb_handle_request, NULL); /* dummy */
#endif
error = USB_HANDLE_REQUEST(iface->subdev,
&req, ppdata, plen,
Modified: head/sys/dev/usb/usb_msctest.c
==============================================================================
--- head/sys/dev/usb/usb_msctest.c Fri Mar 20 22:04:33 2009 (r190185)
+++ head/sys/dev/usb/usb_msctest.c Fri Mar 20 22:10:36 2009 (r190186)
@@ -138,7 +138,6 @@ static const struct usb2_config bbb_conf
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.mh.bufsize = sizeof(struct bbb_cbw),
- .mh.flags = {},
.mh.callback = &bbb_command_callback,
.mh.timeout = 4 * USB_MS_HZ, /* 4 seconds */
},
@@ -158,7 +157,6 @@ static const struct usb2_config bbb_conf
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &bbb_data_rd_cs_callback,
.mh.timeout = 1 * USB_MS_HZ, /* 1 second */
},
@@ -178,7 +176,6 @@ static const struct usb2_config bbb_conf
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
.mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
.mh.callback = &bbb_data_wr_cs_callback,
.mh.timeout = 1 * USB_MS_HZ, /* 1 second */
},
More information about the svn-src-head
mailing list