Deleted Added
sdiff udiff text old ( 196219 ) new ( 196495 )
full compact
umass.c (196219) umass.c (196495)
1#include <sys/cdefs.h>
1#include <sys/cdefs.h>
2__FBSDID("$FreeBSD: head/sys/dev/usb/storage/umass.c 196219 2009-08-14 20:03:53Z jhb $");
2__FBSDID("$FreeBSD: head/sys/dev/usb/storage/umass.c 196495 2009-08-24 05:02:36Z alfred $");
3
4/*-
5 * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
6 * Nick Hibma <n_hibma@FreeBSD.org>
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
3
4/*-
5 * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
6 * Nick Hibma <n_hibma@FreeBSD.org>
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * $FreeBSD: head/sys/dev/usb/storage/umass.c 196219 2009-08-14 20:03:53Z jhb $
30 * $FreeBSD: head/sys/dev/usb/storage/umass.c 196495 2009-08-24 05:02:36Z alfred $
31 * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
32 */
33
34/* Also already merged from NetBSD:
35 * $NetBSD: umass.c,v 1.67 2001/11/25 19:05:22 augustss Exp $
36 * $NetBSD: umass.c,v 1.90 2002/11/04 19:17:33 pooka Exp $
37 * $NetBSD: umass.c,v 1.108 2003/11/07 17:03:25 wiz Exp $
38 * $NetBSD: umass.c,v 1.109 2003/12/04 13:57:31 keihan Exp $

--- 368 unchanged lines hidden (view full) ---

407 {USB_VENDOR_AIPTEK, USB_PRODUCT_AIPTEK_POCKETCAM3M, RID_WILDCARD,
408 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
409 NO_QUIRKS
410 },
411 {USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_SUNPLUS_TECH, RID_WILDCARD,
412 UMASS_PROTO_DEFAULT,
413 NO_SYNCHRONIZE_CACHE
414 },
31 * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
32 */
33
34/* Also already merged from NetBSD:
35 * $NetBSD: umass.c,v 1.67 2001/11/25 19:05:22 augustss Exp $
36 * $NetBSD: umass.c,v 1.90 2002/11/04 19:17:33 pooka Exp $
37 * $NetBSD: umass.c,v 1.108 2003/11/07 17:03:25 wiz Exp $
38 * $NetBSD: umass.c,v 1.109 2003/12/04 13:57:31 keihan Exp $

--- 368 unchanged lines hidden (view full) ---

407 {USB_VENDOR_AIPTEK, USB_PRODUCT_AIPTEK_POCKETCAM3M, RID_WILDCARD,
408 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
409 NO_QUIRKS
410 },
411 {USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_SUNPLUS_TECH, RID_WILDCARD,
412 UMASS_PROTO_DEFAULT,
413 NO_SYNCHRONIZE_CACHE
414 },
415 {USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_SDCR_6335, RID_WILDCARD,
416 UMASS_PROTO_DEFAULT,
417 NO_TEST_UNIT_READY | NO_SYNCHRONIZE_CACHE
418 },
415 {USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_AU6390, RID_WILDCARD,
416 UMASS_PROTO_DEFAULT,
417 NO_SYNCHRONIZE_CACHE
418 },
419 {USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_UMCR_9361, RID_WILDCARD,
420 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
421 NO_GETMAXLUN
422 },

--- 305 unchanged lines hidden (view full) ---

728 {USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXLCB35AN, RID_WILDCARD,
729 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
730 NO_QUIRKS
731 },
732 {USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_LS120CAM, RID_WILDCARD,
733 UMASS_PROTO_UFI,
734 NO_QUIRKS
735 },
419 {USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_AU6390, RID_WILDCARD,
420 UMASS_PROTO_DEFAULT,
421 NO_SYNCHRONIZE_CACHE
422 },
423 {USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_UMCR_9361, RID_WILDCARD,
424 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
425 NO_GETMAXLUN
426 },

--- 305 unchanged lines hidden (view full) ---

732 {USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXLCB35AN, RID_WILDCARD,
733 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
734 NO_QUIRKS
735 },
736 {USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_LS120CAM, RID_WILDCARD,
737 UMASS_PROTO_UFI,
738 NO_QUIRKS
739 },
740 { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SPE3030CC, RID_WILDCARD,
741 UMASS_PROTO_DEFAULT,
742 NO_SYNCHRONIZE_CACHE
743 },
736 {USB_VENDOR_PLEXTOR, USB_PRODUCT_PLEXTOR_40_12_40U, RID_WILDCARD,
737 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
738 NO_TEST_UNIT_READY
739 },
740 {USB_VENDOR_PNY, USB_PRODUCT_PNY_ATTACHE2, RID_WILDCARD,
741 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
742 IGNORE_RESIDUE | NO_START_STOP
743 },

--- 144 unchanged lines hidden (view full) ---

888 {USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE, RID_WILDCARD,
889 UMASS_PROTO_SCSI,
890 NO_QUIRKS
891 },
892 {USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB, RID_WILDCARD,
893 UMASS_PROTO_UFI | UMASS_PROTO_CBI,
894 NO_QUIRKS
895 },
744 {USB_VENDOR_PLEXTOR, USB_PRODUCT_PLEXTOR_40_12_40U, RID_WILDCARD,
745 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
746 NO_TEST_UNIT_READY
747 },
748 {USB_VENDOR_PNY, USB_PRODUCT_PNY_ATTACHE2, RID_WILDCARD,
749 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
750 IGNORE_RESIDUE | NO_START_STOP
751 },

--- 144 unchanged lines hidden (view full) ---

896 {USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE, RID_WILDCARD,
897 UMASS_PROTO_SCSI,
898 NO_QUIRKS
899 },
900 {USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB, RID_WILDCARD,
901 UMASS_PROTO_UFI | UMASS_PROTO_CBI,
902 NO_QUIRKS
903 },
904 {USB_VENDOR_TECLAST, USB_PRODUCT_TECLAST_TLC300, RID_WILDCARD,
905 UMASS_PROTO_DEFAULT,
906 NO_TEST_UNIT_READY | NO_SYNCHRONIZE_CACHE
907 },
896 {USB_VENDOR_TREK, USB_PRODUCT_TREK_MEMKEY, RID_WILDCARD,
897 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
898 NO_INQUIRY
899 },
900 {USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB, RID_WILDCARD,
901 UMASS_PROTO_ATAPI | UMASS_PROTO_BBB,
902 IGNORE_RESIDUE
903 },

--- 56 unchanged lines hidden (view full) ---

960 {USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL, RID_WILDCARD,
961 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
962 NO_INQUIRY | NO_SYNCHRONIZE_CACHE
963 },
964 {USB_VENDOR_ACTIONS, USB_PRODUCT_ACTIONS_MP4, RID_WILDCARD,
965 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
966 NO_SYNCHRONIZE_CACHE
967 },
908 {USB_VENDOR_TREK, USB_PRODUCT_TREK_MEMKEY, RID_WILDCARD,
909 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
910 NO_INQUIRY
911 },
912 {USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB, RID_WILDCARD,
913 UMASS_PROTO_ATAPI | UMASS_PROTO_BBB,
914 IGNORE_RESIDUE
915 },

--- 56 unchanged lines hidden (view full) ---

972 {USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL, RID_WILDCARD,
973 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
974 NO_INQUIRY | NO_SYNCHRONIZE_CACHE
975 },
976 {USB_VENDOR_ACTIONS, USB_PRODUCT_ACTIONS_MP4, RID_WILDCARD,
977 UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
978 NO_SYNCHRONIZE_CACHE
979 },
980 {USB_VENDOR_ASUS, USB_PRODUCT_ASUS_GMSC, RID_WILDCARD,
981 UMASS_PROTO_DEFAULT,
982 NO_SYNCHRONIZE_CACHE
983 },
968 {VID_EOT, PID_EOT, RID_EOT, 0, 0}
969};
970
971struct umass_softc {
972
973 struct scsi_sense cam_scsi_sense;
974 struct scsi_test_unit_ready cam_scsi_test_unit_ready;
975 struct mtx sc_mtx;

--- 2728 unchanged lines hidden --- 		984 {VID_EOT, PID_EOT, RID_EOT, 0, 0}
985};
986
987struct umass_softc {
988
989 struct scsi_sense cam_scsi_sense;
990 struct scsi_test_unit_ready cam_scsi_test_unit_ready;
991 struct mtx sc_mtx;

--- 2728 unchanged lines hidden ---