Date: Thu, 19 Mar 2009 12:58:35 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 159438 for review Message-ID: <200903191258.n2JCwZPF058775@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=159438 Change 159438 by hselasky@hselasky_laptop001 on 2009/03/19 12:58:24 USB storage: - Remove usage of USB_ADD_BYTES() (suggested by DES). Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#5 (text+ko) ==== @@ -59,8 +59,11 @@ /* Define some limits */ -#define USTORAGE_FS_BULK_SIZE (1UL << 17) -#define USTORAGE_FS_MAX_LUN 8 +#ifndef USTORAGE_FS_BULK_SIZE +#define USTORAGE_FS_BULK_SIZE (1UL << 17) /* bytes */ +#endif + +#define USTORAGE_FS_MAX_LUN 8 /* units */ /* * The SCSI ID string must be exactly 28 characters long @@ -136,7 +139,7 @@ struct ustorage_fs_lun { - void *memory_image; + uint8_t *memory_image; uint32_t num_sectors; uint32_t sense_data; @@ -1370,8 +1373,7 @@ file_offset = lba; file_offset <<= 9; - sc->sc_transfer.data_ptr = - USB_ADD_BYTES(currlun->memory_image, (uint32_t)file_offset); + sc->sc_transfer.data_ptr = currlun->memory_image + file_offset; return (0); } @@ -1435,8 +1437,7 @@ file_offset = lba; file_offset <<= 9; - sc->sc_transfer.data_ptr = - USB_ADD_BYTES(currlun->memory_image, (uint32_t)file_offset); + sc->sc_transfer.data_ptr = currlun->memory_image + file_offset; return (0); }help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903191258.n2JCwZPF058775>