Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb Add HP 3400.
details: https://anonhg.NetBSD.org/src/rev/b467f02091ab
branches: trunk
changeset: 508732:b467f02091ab
user: augustss <augustss%NetBSD.org@localhost>
date: Thu Apr 19 00:47:49 2001 +0000
description:
Add HP 3400.
diffstat:
sys/dev/usb/umass.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++-
sys/dev/usb/uscanner.c | 5 +-
2 files changed, 100 insertions(+), 7 deletions(-)
diffs (144 lines):
diff -r 38c5815713cc -r b467f02091ab sys/dev/usb/umass.c
--- a/sys/dev/usb/umass.c Thu Apr 19 00:47:30 2001 +0000
+++ b/sys/dev/usb/umass.c Thu Apr 19 00:47:49 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.58 2001/04/17 00:50:13 augustss Exp $ */
+/* $NetBSD: umass.c,v 1.59 2001/04/19 00:47:49 augustss Exp $ */
/*-
* Copyright (c) 1999 MAEKAWA Masahide <bishop%rr.iij4u.or.jp@localhost>,
* Nick Hibma <n_hibma%freebsd.org@localhost>
@@ -150,9 +150,103 @@
};
#endif
-struct cam_sim *umass_sim; /* SCSI Interface Module */
-struct cam_path *umass_path; /* and its path */
-
+#define US_SC_8020 0
+#define US_SC_8070 0
+#define US_SC_SCSI 0
+#define US_SC_UFI 0
+#define US_SC_QIC 0
+#define US_SC_RBC 0
+#define US_PR_CBI 0
+#define US_PR_CB 0
+#define US_PR_BULK 0
+#define US_PR_SCM_ATAPI 0
+#define US_PR_EUSB_SDDR09 0
+#define US_PR_DPCM_USB 0
+#define US_PR_FREECOM 0
+#define init_8200e 0
+#define usb_stor_euscsi_init 0
+#define freecom_init 0
+#define US_FL_SCM_MULT_TARG 0
+#define US_FL_SINGLE_LUN 0
+#define US_FL_START_STOP 0
+#define US_FL_MODE_XLATE 0
+#define US_FL_IGNORE_SER 0
+struct umass_special {
+ u_int16_t vendor;
+ u_int16_t product;
+ u_int16_t revlo, revhi;
+ u_int8_t busproto;
+ u_int8_t usbproto;
+ void (*init)(void *);
+ u_int32_t flags;
+} umass_specials[] = {
+ { USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW, 0x0000, 0x0245,
+ US_SC_8020, US_PR_CBI, NULL, 0 },
+ { USB_VENDOR_HP, USB_PRODUCT_HP_CDWRITERPLUS, 0x0200, 0x0200,
+ US_SC_8070, US_PR_CB, NULL, 0 },
+ { USB_VENDOR_HP, USB_PRODUCT_HP_CDW8200, 0x0001, 0x0001,
+ US_SC_8070, US_PR_SCM_ATAPI, init_8200e, 0 },
+ { USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_DPCM_USB, NULL, US_FL_START_STOP },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB, 0x0200, 0x0200,
+ US_SC_8020, US_PR_CB, NULL, 0 },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SDDR09, 0x0000, 0x9999,
+ US_SC_SCSI, US_PR_EUSB_SDDR09, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC, 0x0100, 0x0200,
+ US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_HIFD, 0x0100, 0x0200,
+ US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBATAPI, 0x0200, 0x0200,
+ US_SC_8020, US_PR_CB, NULL, 0 },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CF, 0x0200, 0x0200,
+ US_SC_8020, US_PR_CB, NULL, 0 },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI_B, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI_C, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
+ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CDRW, 0x0200, 0x0200,
+ US_SC_8020, US_PR_CB, NULL, 0 },
+ { USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC, 0x0106, 0x0210,
+ US_SC_SCSI, US_PR_CB, NULL,
+ US_FL_SINGLE_LUN | US_FL_START_STOP | US_FL_MODE_XLATE },
+ { USB_VENDOR_SONY, USB_PRODUCT_SONY_MSACUS1, 0x0100, 0x0100,
+ US_SC_UFI, US_PR_CB, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
+ { USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU, 0x0000, 0x0299,
+ US_SC_UFI, US_PR_CB, NULL, US_FL_SINGLE_LUN },
+ { USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU, 0x0300, 0x9999,
+ US_SC_UFI, US_PR_CBI, NULL, US_FL_SINGLE_LUN },
+ { USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD, 0x0200, 0x0200,
+ US_SC_RBC, US_PR_CB, NULL, 0 },
+ { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI, 0x0100, 0x0100,
+ US_SC_8070, US_PR_BULK, NULL, 0 },
+ { USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB, 0x0100, 0x0100,
+ US_SC_UFI, US_PR_CB, NULL, 0 },
+ { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_MAUSB2, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_EUSB_SDDR09, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
+ { USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_BULK, NULL, 0 },
+ { USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FG, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_BULK, NULL, 0 },
+ { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A, 0x0200, 0x0200,
+ US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
+ { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR12, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN },
+ { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR09, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_EUSB_SDDR09, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
+ { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31, 0x0009, 0x0009,
+ US_SC_SCSI, US_PR_BULK, NULL, US_FL_IGNORE_SER },
+ { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
+ { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_FREECOM, 0x0000, 0x9999,
+ US_SC_QIC, US_PR_FREECOM, freecom_init, 0 },
+ { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIHD50, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
+ { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM, 0x0100, 0x0100,
+ US_SC_SCSI, US_PR_DPCM_USB, NULL, US_FL_START_STOP },
+ { 0,0,0,0,0,0,NULL,0 }
+};
/* USB device probe/attach/detach functions */
USB_DECLARE_DRIVER(umass);
diff -r 38c5815713cc -r b467f02091ab sys/dev/usb/uscanner.c
--- a/sys/dev/usb/uscanner.c Thu Apr 19 00:47:30 2001 +0000
+++ b/sys/dev/usb/uscanner.c Thu Apr 19 00:47:49 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.14 2001/04/01 14:50:58 augustss Exp $ */
+/* $NetBSD: uscanner.c,v 1.15 2001/04/19 00:47:50 augustss Exp $ */
/* $FreeBSD$ */
/*
@@ -97,6 +97,7 @@
/* HP */
{ USB_VENDOR_HP, USB_PRODUCT_HP_3300C },
+ { USB_VENDOR_HP, USB_PRODUCT_HP_3400CSE },
{ USB_VENDOR_HP, USB_PRODUCT_HP_4100C },
{ USB_VENDOR_HP, USB_PRODUCT_HP_4200C },
{ USB_VENDOR_HP, USB_PRODUCT_HP_S20 },
@@ -165,10 +166,8 @@
{ USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8100 },
{ USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8600 },
-#if NOT_TEST
/* Canon */
{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U },
-#endif
{ 0, 0 }
};
Home |
Main Index |
Thread Index |
Old Index