Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Mar 2009 14:24:41 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 159517 for review
Message-ID:  <200903201424.n2KEOfCP086279@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=159517

Change 159517 by hselasky@hselasky_laptop001 on 2009/03/20 14:24:19

	
	USB:
	- more IAR compile fixes

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#134 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#7 (text+ko) ====

@@ -167,7 +167,6 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.mh.bufsize = sizeof(struct usb2_device_request),
-		.mh.flags = {},
 		.mh.callback = &uscanner_write_clear_stall_callback,
 		.mh.timeout = 1000,
 		.mh.interval = 50,	/* 50ms */
@@ -178,7 +177,6 @@
 		.endpoint = 0x00,
 		.direction = UE_DIR_ANY,
 		.mh.bufsize = sizeof(struct usb2_device_request),
-		.mh.flags = {},
 		.mh.callback = &uscanner_read_clear_stall_callback,
 		.mh.timeout = 1000,
 		.mh.interval = 50,	/* 50ms */

==== //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#3 (text+ko) ====

@@ -212,7 +212,6 @@
 		.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 @@
 		.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 */

==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#4 (text+ko) ====

@@ -121,7 +121,6 @@
 		.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 */
 	},

==== //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#3 (text+ko) ====

@@ -252,7 +252,6 @@
 		.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 */
 	},

==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#8 (text+ko) ====

@@ -1064,7 +1064,6 @@
 		.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 */
@@ -1075,7 +1074,6 @@
 		.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 */
@@ -1086,7 +1084,6 @@
 		.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 */
@@ -1097,7 +1094,6 @@
 		.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 */
 	},
@@ -1117,7 +1113,6 @@
 		.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 */
 	},
@@ -1137,7 +1132,6 @@
 		.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 */
 	},
@@ -1161,7 +1155,6 @@
 		.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 */
@@ -1172,7 +1165,6 @@
 		.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 */
@@ -1183,7 +1175,6 @@
 		.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 */
@@ -1195,7 +1186,6 @@
 		.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 */
 	},
@@ -1215,7 +1205,6 @@
 		.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 */
 	},
@@ -1235,7 +1224,6 @@
 		.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 */
 	},
@@ -1255,7 +1243,6 @@
 		.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 */
 	},

==== //depot/projects/usb/src/sys/dev/usb/storage/urio.c#4 (text+ko) ====

@@ -149,7 +149,6 @@
 		.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 @@
 		.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 */

==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#4 (text+ko) ====

@@ -138,7 +138,6 @@
 		.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 @@
 		.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 @@
 		.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  */
 	},

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#134 (text+ko) ====

@@ -113,7 +113,6 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.mh.bufsize = sizeof(struct usb2_device_request),
-		.mh.flags = {},
 		.mh.callback = &usb2_do_clear_stall_callback,
 		.mh.timeout = 1000,	/* 1 second */
 		.mh.interval = 50,	/* 50ms */
@@ -2671,7 +2670,6 @@
  *	.interval = 50, //50 milliseconds
  *	.bufsize = sizeof(struct usb2_device_request),
  *	.mh.timeout = 1000, //1.000 seconds
- *	.mh.flags = { },
  *	.mh.callback = &my_clear_stall_callback, // **
  * };
  *



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903201424.n2KEOfCP086279>