remove unneeded includes; ok mpi@

Remove needless uses of SDEV_ONLYBIG. It was always set when SDEV_UMASS was set,
and was always checked in concert with SDEV_ATAPI. Just rely on SDEV_ATAPI and
SDEV_UMASS in all but the one place sd(4) where SDEV_ONLYBIG is set
independently of SDEV_ATAPI/_UMASS.

ok jmatthew@

Blacklist Ericsson F5521gw broadband modem.

ok sthen@

Quirk needed for SuperTop IDE bridge from frantisek holop.

Quirk needed by the Archos 24y Vision, from Max Fillinger.

First pass at removing clauses 3 and 4 from NetBSD licenses.

Not sure what's more surprising: how long it took for NetBSD to
catch up to the rest of the BSDs (including UCB), or the amount of
code that NetBSD has claimed for itself without attributing to the
actual authors.

OK deraadt@

Remove the definition and use of umass/umass_quirks related macros.

No binary change.

ok dlg.

Remove the definition and use of the USBDEVNAME macro.

(This might look easy, but it was a big diff. Thanks to dlg and especially jsg
for looking over it; we found at least four mistakes in the initial diff.)

ok jsg.

Remove the "Static" declaration of many functions. It was defined to be empty
and it was not consistently used. It was confusing as it suggested these
functions were static, which they were not.

discussed with dlg and jsg, ok jsg.

Last part of FreeBSD/NetBSD sepcific code removal.

ok jsg@

add quirk for Sony DSC-T10, which is UFI, not SCSI.

help and ok krw@

Better describe the magic done by umass_fixup_sony(), okay krw@

Add quirk for Sony DSC-W50 (which is UFI, not SCSI) and rearrange
umass_fixup_sony() a bit while there, okay krw@

The Sony DSC-P41 it's actually UFI, not SCSI. Unfortunately (all?) DSC
cameras share the same product id, so toggle this behavior for revision
5.00 only for now. krw@ agrees.

Apparently the Scanlogic SL11R is not UFI, and correctly identifies itself as
SCSI. From NetBSD. Tested by me.
ok krw@

Eradicate USB quirks NOTUR and NODOORLOCK. Should no longer be
required and no actual users of the relevant devices found.

ok marco@

M-Systems DiskOnKey2 works better with zero padded commands so make it
CPROTO_ATAPI. This is what my 'IBM USB 2.0 Memory Key' actually was.

PQUIK_NOMODESENSE no longer does anything, and PQUIRK_NOBIGMODESENSE was
defined to be 0. Expunge references. Null entries in quirks table will be
removed later.

quirk for iriver 3xx.

ok dlg@

quirks for the Creative Nomad from Michael Adda

push by deraadt@

from netbsd, umass.c 1.100 1.113 1.115, umass_scsipi.c 1.11, umassvar.h 1.21
log message for umass 1.98, umass_scsipi.c 1.11, umassvar.h 1.21:
Fix several problems with CCI handling, and enable it: * We were never calling
the callback function when we got a UFI CCI(!). * We were passing a bogus
residual count on non-UFI CCIs. * After a REQUEST SENSE, the UFI CCI may
include the ASC/ASCQ from the sense information -- don't consider this a
failure.

In addition, remove a horrible hack that was causing us to drop sense
information on the floor and return empty INQUIRY responses, often in the
case where there is a UNIT ATTENTION pending during the INQUIRY. (Some drives
send the data and then fail, some don't.)

log message for umass.c 1.113:
Do not return STATUS_WIRE_FAILED in response to a CBI stall. This is perfectly
normal, and is used to report errors. Instead, use STATUS_CMD_FAILED, which
causes us to do a REQUEST SENSE. Should address PR 22960.

log message for umass.c 1.115:
Do not do a CBI reset before returning STATUS_CMD_FAILED. This causes any
sense information to be thrown away, and is therefore nonsensical.

ok krw@

from netbsd, umass.c 1.98, umassvar.h 1.20
log message:
Remove UMASS_QUIRK_NO_START_STOP and UMASS_QUIRK_NO_MAX_LUN.

We don't have UMASS_QUIRK_NO_START_STOP so I didn't have to remove it. I
consider umass_quirks.c to be too different so I hand removed references to
the removed defines. There are some useless entries in there now which will
be cleaned up after umass is merged with netbsd.

ok deraadt@

from netbsd:
The Sony camera reports itself as a "disk", not a "simplified direct access"
device -- ergo, it is "SCSI", not "RBC".

support iriver ifp-1xx thingies

minolta dimage A1 quirk; 3734, michael@paddon.org

Eliminate the quirks SDEV_NOSTARTUNIT, UMASS_QUIRK_NO_START_STOP, and
UMASS_QUIRK_FORCE_SHORT_INQUIRY. Fixes a bunch of USB devices. Based
on work by Mycroft in NetBSD.

ok tdeval@ deraadt@.

Nuke SDEV_NOLUNS, SDEV_FORCELUNS, and PQUIRK_FORCELUNS quirks. Also
moreluns field in scsi_link structure. Instead, treat an INQUIRY
result that duplicates the INQUIRY result of LUN 0 as proof the LUN
does not exist. Compensate for lack of SDEV_NOLUNS where necessary by
setting sc_link->luns to 1, which has the same effect. From Marco
Peereboom.

Don't issue Test Unit Ready command before INQUIRY command - not
necessary and potentially harmful to devices with ADEV_NOTUR quirk
since quirks have not been set yet. From mycroft@NetBSD

ok deraadt@, mvme* changes by miod@.

my USB_PRODUCT_SHUTTLE_EUSB needs PQUIRK_NOSENSE; ok henning

add quirk for Datum Networks SSF-7X USB Multi Players
PR3580; Aldo Cortesi <aldo@nullcube.com>

branches: 1.6.2; 1.6.4;
add a quirk for my trek thumbdrive

add a quirk for the Imation FlashGo adapter to make it shut up

add a quirk for a different zip250 model

sync with NetBSD and add various local hacks to make things work correctly
with our scsi layer

Meant to commit only ulpt and committed everything. Most things weren't ready

Sync ulpt driver with NetBSD

Remove needless uses of SDEV_ONLYBIG. It was always set when SDEV_UMASS was set,
and was always checked in concert with SDEV_ATAPI. Just rely on SDEV_ATAPI and
SDEV_UMASS in all but the one place sd(4) where SDEV_ONLYBIG is set
independently of SDEV_ATAPI/_UMASS.

ok jmatthew@

Blacklist Ericsson F5521gw broadband modem.

ok sthen@

Quirk needed for SuperTop IDE bridge from frantisek holop.

Quirk needed by the Archos 24y Vision, from Max Fillinger.

First pass at removing clauses 3 and 4 from NetBSD licenses.

Not sure what's more surprising: how long it took for NetBSD to
catch up to the rest of the BSDs (including UCB), or the amount of
code that NetBSD has claimed for itself without attributing to the
actual authors.

OK deraadt@

Remove the definition and use of umass/umass_quirks related macros.

No binary change.

ok dlg.

Remove the definition and use of the USBDEVNAME macro.

(This might look easy, but it was a big diff. Thanks to dlg and especially jsg
for looking over it; we found at least four mistakes in the initial diff.)

ok jsg.

Remove the "Static" declaration of many functions. It was defined to be empty
and it was not consistently used. It was confusing as it suggested these
functions were static, which they were not.

discussed with dlg and jsg, ok jsg.

Last part of FreeBSD/NetBSD sepcific code removal.

ok jsg@

add quirk for Sony DSC-T10, which is UFI, not SCSI.

help and ok krw@

Better describe the magic done by umass_fixup_sony(), okay krw@

Add quirk for Sony DSC-W50 (which is UFI, not SCSI) and rearrange
umass_fixup_sony() a bit while there, okay krw@

The Sony DSC-P41 it's actually UFI, not SCSI. Unfortunately (all?) DSC
cameras share the same product id, so toggle this behavior for revision
5.00 only for now. krw@ agrees.

Apparently the Scanlogic SL11R is not UFI, and correctly identifies itself as
SCSI. From NetBSD. Tested by me.
ok krw@

Eradicate USB quirks NOTUR and NODOORLOCK. Should no longer be
required and no actual users of the relevant devices found.

ok marco@

M-Systems DiskOnKey2 works better with zero padded commands so make it
CPROTO_ATAPI. This is what my 'IBM USB 2.0 Memory Key' actually was.

PQUIK_NOMODESENSE no longer does anything, and PQUIRK_NOBIGMODESENSE was
defined to be 0. Expunge references. Null entries in quirks table will be
removed later.

quirk for iriver 3xx.

ok dlg@

quirks for the Creative Nomad from Michael Adda

push by deraadt@

from netbsd, umass.c 1.100 1.113 1.115, umass_scsipi.c 1.11, umassvar.h 1.21
log message for umass 1.98, umass_scsipi.c 1.11, umassvar.h 1.21:
Fix several problems with CCI handling, and enable it: * We were never calling
the callback function when we got a UFI CCI(!). * We were passing a bogus
residual count on non-UFI CCIs. * After a REQUEST SENSE, the UFI CCI may
include the ASC/ASCQ from the sense information -- don't consider this a
failure.

In addition, remove a horrible hack that was causing us to drop sense
information on the floor and return empty INQUIRY responses, often in the
case where there is a UNIT ATTENTION pending during the INQUIRY. (Some drives
send the data and then fail, some don't.)

log message for umass.c 1.113:
Do not return STATUS_WIRE_FAILED in response to a CBI stall. This is perfectly
normal, and is used to report errors. Instead, use STATUS_CMD_FAILED, which
causes us to do a REQUEST SENSE. Should address PR 22960.

log message for umass.c 1.115:
Do not do a CBI reset before returning STATUS_CMD_FAILED. This causes any
sense information to be thrown away, and is therefore nonsensical.

ok krw@

from netbsd, umass.c 1.98, umassvar.h 1.20
log message:
Remove UMASS_QUIRK_NO_START_STOP and UMASS_QUIRK_NO_MAX_LUN.

We don't have UMASS_QUIRK_NO_START_STOP so I didn't have to remove it. I
consider umass_quirks.c to be too different so I hand removed references to
the removed defines. There are some useless entries in there now which will
be cleaned up after umass is merged with netbsd.

ok deraadt@

from netbsd:
The Sony camera reports itself as a "disk", not a "simplified direct access"
device -- ergo, it is "SCSI", not "RBC".

support iriver ifp-1xx thingies

minolta dimage A1 quirk; 3734, michael@paddon.org

Eliminate the quirks SDEV_NOSTARTUNIT, UMASS_QUIRK_NO_START_STOP, and
UMASS_QUIRK_FORCE_SHORT_INQUIRY. Fixes a bunch of USB devices. Based
on work by Mycroft in NetBSD.

ok tdeval@ deraadt@.

Nuke SDEV_NOLUNS, SDEV_FORCELUNS, and PQUIRK_FORCELUNS quirks. Also
moreluns field in scsi_link structure. Instead, treat an INQUIRY
result that duplicates the INQUIRY result of LUN 0 as proof the LUN
does not exist. Compensate for lack of SDEV_NOLUNS where necessary by
setting sc_link->luns to 1, which has the same effect. From Marco
Peereboom.

Don't issue Test Unit Ready command before INQUIRY command - not
necessary and potentially harmful to devices with ADEV_NOTUR quirk
since quirks have not been set yet. From mycroft@NetBSD

ok deraadt@, mvme* changes by miod@.

my USB_PRODUCT_SHUTTLE_EUSB needs PQUIRK_NOSENSE; ok henning

add quirk for Datum Networks SSF-7X USB Multi Players
PR3580; Aldo Cortesi <aldo@nullcube.com>

branches: 1.6.2; 1.6.4;
add a quirk for my trek thumbdrive

add a quirk for the Imation FlashGo adapter to make it shut up

add a quirk for a different zip250 model

sync with NetBSD and add various local hacks to make things work correctly
with our scsi layer

Meant to commit only ulpt and committed everything. Most things weren't ready

Sync ulpt driver with NetBSD

Blacklist Ericsson F5521gw broadband modem.

ok sthen@

Quirk needed for SuperTop IDE bridge from frantisek holop.

Quirk needed by the Archos 24y Vision, from Max Fillinger.

First pass at removing clauses 3 and 4 from NetBSD licenses.

Not sure what's more surprising: how long it took for NetBSD to
catch up to the rest of the BSDs (including UCB), or the amount of
code that NetBSD has claimed for itself without attributing to the
actual authors.

OK deraadt@

Remove the definition and use of umass/umass_quirks related macros.

No binary change.

ok dlg.

Remove the definition and use of the USBDEVNAME macro.

(This might look easy, but it was a big diff. Thanks to dlg and especially jsg
for looking over it; we found at least four mistakes in the initial diff.)

ok jsg.

Remove the "Static" declaration of many functions. It was defined to be empty
and it was not consistently used. It was confusing as it suggested these
functions were static, which they were not.

discussed with dlg and jsg, ok jsg.

Last part of FreeBSD/NetBSD sepcific code removal.

ok jsg@

add quirk for Sony DSC-T10, which is UFI, not SCSI.

help and ok krw@

Better describe the magic done by umass_fixup_sony(), okay krw@

Add quirk for Sony DSC-W50 (which is UFI, not SCSI) and rearrange
umass_fixup_sony() a bit while there, okay krw@

The Sony DSC-P41 it's actually UFI, not SCSI. Unfortunately (all?) DSC
cameras share the same product id, so toggle this behavior for revision
5.00 only for now. krw@ agrees.

Apparently the Scanlogic SL11R is not UFI, and correctly identifies itself as
SCSI. From NetBSD. Tested by me.
ok krw@

Eradicate USB quirks NOTUR and NODOORLOCK. Should no longer be
required and no actual users of the relevant devices found.

ok marco@

M-Systems DiskOnKey2 works better with zero padded commands so make it
CPROTO_ATAPI. This is what my 'IBM USB 2.0 Memory Key' actually was.

PQUIK_NOMODESENSE no longer does anything, and PQUIRK_NOBIGMODESENSE was
defined to be 0. Expunge references. Null entries in quirks table will be
removed later.

quirk for iriver 3xx.

ok dlg@

quirks for the Creative Nomad from Michael Adda

push by deraadt@

from netbsd, umass.c 1.100 1.113 1.115, umass_scsipi.c 1.11, umassvar.h 1.21
log message for umass 1.98, umass_scsipi.c 1.11, umassvar.h 1.21:
Fix several problems with CCI handling, and enable it: * We were never calling
the callback function when we got a UFI CCI(!). * We were passing a bogus
residual count on non-UFI CCIs. * After a REQUEST SENSE, the UFI CCI may
include the ASC/ASCQ from the sense information -- don't consider this a
failure.

In addition, remove a horrible hack that was causing us to drop sense
information on the floor and return empty INQUIRY responses, often in the
case where there is a UNIT ATTENTION pending during the INQUIRY. (Some drives
send the data and then fail, some don't.)

log message for umass.c 1.113:
Do not return STATUS_WIRE_FAILED in response to a CBI stall. This is perfectly
normal, and is used to report errors. Instead, use STATUS_CMD_FAILED, which
causes us to do a REQUEST SENSE. Should address PR 22960.

log message for umass.c 1.115:
Do not do a CBI reset before returning STATUS_CMD_FAILED. This causes any
sense information to be thrown away, and is therefore nonsensical.

ok krw@

from netbsd, umass.c 1.98, umassvar.h 1.20
log message:
Remove UMASS_QUIRK_NO_START_STOP and UMASS_QUIRK_NO_MAX_LUN.

We don't have UMASS_QUIRK_NO_START_STOP so I didn't have to remove it. I
consider umass_quirks.c to be too different so I hand removed references to
the removed defines. There are some useless entries in there now which will
be cleaned up after umass is merged with netbsd.

ok deraadt@

from netbsd:
The Sony camera reports itself as a "disk", not a "simplified direct access"
device -- ergo, it is "SCSI", not "RBC".

support iriver ifp-1xx thingies

minolta dimage A1 quirk; 3734, michael@paddon.org

Eliminate the quirks SDEV_NOSTARTUNIT, UMASS_QUIRK_NO_START_STOP, and
UMASS_QUIRK_FORCE_SHORT_INQUIRY. Fixes a bunch of USB devices. Based
on work by Mycroft in NetBSD.

ok tdeval@ deraadt@.

Nuke SDEV_NOLUNS, SDEV_FORCELUNS, and PQUIRK_FORCELUNS quirks. Also
moreluns field in scsi_link structure. Instead, treat an INQUIRY
result that duplicates the INQUIRY result of LUN 0 as proof the LUN
does not exist. Compensate for lack of SDEV_NOLUNS where necessary by
setting sc_link->luns to 1, which has the same effect. From Marco
Peereboom.

Don't issue Test Unit Ready command before INQUIRY command - not
necessary and potentially harmful to devices with ADEV_NOTUR quirk
since quirks have not been set yet. From mycroft@NetBSD

ok deraadt@, mvme* changes by miod@.

my USB_PRODUCT_SHUTTLE_EUSB needs PQUIRK_NOSENSE; ok henning

add quirk for Datum Networks SSF-7X USB Multi Players
PR3580; Aldo Cortesi <aldo@nullcube.com>

branches: 1.6.2; 1.6.4;
add a quirk for my trek thumbdrive

add a quirk for the Imation FlashGo adapter to make it shut up

add a quirk for a different zip250 model

sync with NetBSD and add various local hacks to make things work correctly
with our scsi layer

Meant to commit only ulpt and committed everything. Most things weren't ready

Sync ulpt driver with NetBSD

Quirk needed for SuperTop IDE bridge from frantisek holop.

Quirk needed by the Archos 24y Vision, from Max Fillinger.

First pass at removing clauses 3 and 4 from NetBSD licenses.

Not sure what's more surprising: how long it took for NetBSD to
catch up to the rest of the BSDs (including UCB), or the amount of
code that NetBSD has claimed for itself without attributing to the
actual authors.

OK deraadt@

Remove the definition and use of umass/umass_quirks related macros.

No binary change.

ok dlg.

Remove the definition and use of the USBDEVNAME macro.

(This might look easy, but it was a big diff. Thanks to dlg and especially jsg
for looking over it; we found at least four mistakes in the initial diff.)

ok jsg.

Remove the "Static" declaration of many functions. It was defined to be empty
and it was not consistently used. It was confusing as it suggested these
functions were static, which they were not.

discussed with dlg and jsg, ok jsg.

Last part of FreeBSD/NetBSD sepcific code removal.

ok jsg@

add quirk for Sony DSC-T10, which is UFI, not SCSI.

help and ok krw@

Better describe the magic done by umass_fixup_sony(), okay krw@

Add quirk for Sony DSC-W50 (which is UFI, not SCSI) and rearrange
umass_fixup_sony() a bit while there, okay krw@

The Sony DSC-P41 it's actually UFI, not SCSI. Unfortunately (all?) DSC
cameras share the same product id, so toggle this behavior for revision
5.00 only for now. krw@ agrees.

Apparently the Scanlogic SL11R is not UFI, and correctly identifies itself as
SCSI. From NetBSD. Tested by me.
ok krw@

Eradicate USB quirks NOTUR and NODOORLOCK. Should no longer be
required and no actual users of the relevant devices found.

ok marco@

M-Systems DiskOnKey2 works better with zero padded commands so make it
CPROTO_ATAPI. This is what my 'IBM USB 2.0 Memory Key' actually was.

PQUIK_NOMODESENSE no longer does anything, and PQUIRK_NOBIGMODESENSE was
defined to be 0. Expunge references. Null entries in quirks table will be
removed later.

quirk for iriver 3xx.

ok dlg@

quirks for the Creative Nomad from Michael Adda

push by deraadt@

from netbsd, umass.c 1.100 1.113 1.115, umass_scsipi.c 1.11, umassvar.h 1.21
log message for umass 1.98, umass_scsipi.c 1.11, umassvar.h 1.21:
Fix several problems with CCI handling, and enable it: * We were never calling
the callback function when we got a UFI CCI(!). * We were passing a bogus
residual count on non-UFI CCIs. * After a REQUEST SENSE, the UFI CCI may
include the ASC/ASCQ from the sense information -- don't consider this a
failure.

In addition, remove a horrible hack that was causing us to drop sense
information on the floor and return empty INQUIRY responses, often in the
case where there is a UNIT ATTENTION pending during the INQUIRY. (Some drives
send the data and then fail, some don't.)

log message for umass.c 1.113:
Do not return STATUS_WIRE_FAILED in response to a CBI stall. This is perfectly
normal, and is used to report errors. Instead, use STATUS_CMD_FAILED, which
causes us to do a REQUEST SENSE. Should address PR 22960.

log message for umass.c 1.115:
Do not do a CBI reset before returning STATUS_CMD_FAILED. This causes any
sense information to be thrown away, and is therefore nonsensical.

ok krw@

from netbsd, umass.c 1.98, umassvar.h 1.20
log message:
Remove UMASS_QUIRK_NO_START_STOP and UMASS_QUIRK_NO_MAX_LUN.

We don't have UMASS_QUIRK_NO_START_STOP so I didn't have to remove it. I
consider umass_quirks.c to be too different so I hand removed references to
the removed defines. There are some useless entries in there now which will
be cleaned up after umass is merged with netbsd.

ok deraadt@

from netbsd:
The Sony camera reports itself as a "disk", not a "simplified direct access"
device -- ergo, it is "SCSI", not "RBC".

support iriver ifp-1xx thingies

minolta dimage A1 quirk; 3734, michael@paddon.org

Eliminate the quirks SDEV_NOSTARTUNIT, UMASS_QUIRK_NO_START_STOP, and
UMASS_QUIRK_FORCE_SHORT_INQUIRY. Fixes a bunch of USB devices. Based
on work by Mycroft in NetBSD.

ok tdeval@ deraadt@.

Nuke SDEV_NOLUNS, SDEV_FORCELUNS, and PQUIRK_FORCELUNS quirks. Also
moreluns field in scsi_link structure. Instead, treat an INQUIRY
result that duplicates the INQUIRY result of LUN 0 as proof the LUN
does not exist. Compensate for lack of SDEV_NOLUNS where necessary by
setting sc_link->luns to 1, which has the same effect. From Marco
Peereboom.

Don't issue Test Unit Ready command before INQUIRY command - not
necessary and potentially harmful to devices with ADEV_NOTUR quirk
since quirks have not been set yet. From mycroft@NetBSD

ok deraadt@, mvme* changes by miod@.

my USB_PRODUCT_SHUTTLE_EUSB needs PQUIRK_NOSENSE; ok henning

add quirk for Datum Networks SSF-7X USB Multi Players
PR3580; Aldo Cortesi <aldo@nullcube.com>

branches: 1.6.2; 1.6.4;
add a quirk for my trek thumbdrive

add a quirk for the Imation FlashGo adapter to make it shut up

add a quirk for a different zip250 model

sync with NetBSD and add various local hacks to make things work correctly
with our scsi layer

Meant to commit only ulpt and committed everything. Most things weren't ready

Sync ulpt driver with NetBSD