PERFORCE change 144566 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Thu Jul 3 19:53:43 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144566
Change 144566 by hselasky at hselasky_laptop001 on 2008/07/03 19:52:56
Style changes by "usb_style.sh".
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#3 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#3 (text) ====
@@ -379,8 +379,8 @@
(strcmp(subclass, "ATAPI") && strcmp(subclass, "SCSI"))) {
goto detach;
}
- err = usb2_transfer_setup(uaa->device, &(uaa->info.bIfaceIndex),
- sc->xfer, atausb2_config, ATAUSB_T_BBB_MAX, sc,
+ err = usb2_transfer_setup(uaa->device, &(uaa->info.bIfaceIndex),
+ sc->xfer, atausb2_config, ATAUSB_T_BBB_MAX, sc,
&(sc->locked_mtx));
/* skip reset first time */
==== //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#3 (text+ko) ====
@@ -238,7 +238,7 @@
error = usb2_fifo_attach(uaa->device, sc, &(sc->sc_mtx),
&urio_fifo_methods, &(sc->sc_fifo),
- device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex);
+ device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex);
if (error) {
goto detach;
}
==== //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.h#2 (text+ko) ====
@@ -24,6 +24,6 @@
*/
#ifndef _USB2_STORAGE_H_
-#define _USB2_STORAGE_H_
+#define _USB2_STORAGE_H_
-#endif /* _USB2_STORAGE_H_ */
+#endif /* _USB2_STORAGE_H_ */
==== //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#3 (text+ko) ====
@@ -328,12 +328,15 @@
if (sc->sc_unit == 0) {
if (ustorage_fs_ramdisk == NULL) {
- /* allocate a memory image for our ramdisk until further */
- ustorage_fs_ramdisk =
- malloc(USTORAGE_FS_RAM_SECT << 9, M_USB, M_ZERO | M_WAITOK);
- if (ustorage_fs_ramdisk == NULL) {
- return (ENOMEM);
- }
+ /*
+ * allocate a memory image for our ramdisk until
+ * further
+ */
+ ustorage_fs_ramdisk =
+ malloc(USTORAGE_FS_RAM_SECT << 9, M_USB, M_ZERO | M_WAITOK);
+ if (ustorage_fs_ramdisk == NULL) {
+ return (ENOMEM);
+ }
}
sc->sc_lun[0].memory_image = ustorage_fs_ramdisk;
sc->sc_lun[0].num_sectors = USTORAGE_FS_RAM_SECT;
More information about the p4-projects
mailing list