diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2003-05-17 06:07:58 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2003-05-17 06:07:58 +0000 |
| commit | df7d9b90217d237dbfa834d916f3dd30fd17acf9 (patch) | |
| tree | bad00563dfc21d9a28ce8ed0d3b424ebd4b5a335 /sys/dev/usb/usscanner.c | |
| parent | 3df1cd04c783ecc40cffe562619053e8c7012be2 (diff) | |
sync with NetBSD and add various local hacks to make things work correctly
with our scsi layer
Diffstat (limited to 'sys/dev/usb/usscanner.c')
| -rw-r--r-- | sys/dev/usb/usscanner.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c index 7479f6c72b6..3ab9f622ebb 100644 --- a/sys/dev/usb/usscanner.c +++ b/sys/dev/usb/usscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usscanner.c,v 1.7 2003/05/07 04:33:33 deraadt Exp $ */ +/* $OpenBSD: usscanner.c,v 1.8 2003/05/17 06:07:57 nate Exp $ */ /* $NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $ */ /* @@ -89,6 +89,22 @@ int usscannerdebug = 0; #define DPRINTFN(n,x) #endif +#define XS_CTL_DATA_IN SCSI_DATA_IN +#define XS_CTL_DATA_OUT SCSI_DATA_OUT +#define scsipi_adapter scsi_adapter +#define scsipi_cmd scsi_cmd +#define scsipi_device scsi_device +#define scsipi_done scsi_done +#define scsipi_link scsi_link +#define scsipi_minphys scsi_minphys +#define scsipi_sense scsi_sense +#define scsipi_xfer scsi_xfer +#define show_scsipi_xs show_scsi_xs +#define show_scsipi_cmd show_scsi_cmd +#define xs_control flags +#define xs_status status +#define XS_STS_DONE ITSDONE +#define XS_CTL_POLL SCSI_POLL #define USSCANNER_CONFIG_NO 1 #define USSCANNER_IFACE_IDX 0 |