Deleted Added
full compact
scsi_da.c (87577) scsi_da.c (88765)
1/*
2 * Implementation of SCSI Direct Access Peripheral driver for CAM.
3 *
4 * Copyright (c) 1997 Justin T. Gibbs.
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

20 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
1/*
2 * Implementation of SCSI Direct Access Peripheral driver for CAM.
3 *
4 * Copyright (c) 1997 Justin T. Gibbs.
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

20 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * $FreeBSD: head/sys/cam/scsi/scsi_da.c 87577 2001-12-09 21:38:33Z iedowse $
28 * $FreeBSD: head/sys/cam/scsi/scsi_da.c 88765 2002-01-01 13:28:43Z jedgar $
29 */
30
31#ifdef _KERNEL
32#include "opt_hw_wdog.h"
33#endif /* _KERNEL */
34
35#include <sys/param.h>
36

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

326 /*
327 * FujiFilm Camera
328 */
329 {T_DIRECT, SIP_MEDIA_REMOVABLE, "FUJIFILMUSB-DRIVEUNIT", "USB-DRIVEUNIT", "*"},
330 /*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE
331 },
332 {
333 /*
29 */
30
31#ifdef _KERNEL
32#include "opt_hw_wdog.h"
33#endif /* _KERNEL */
34
35#include <sys/param.h>
36

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

326 /*
327 * FujiFilm Camera
328 */
329 {T_DIRECT, SIP_MEDIA_REMOVABLE, "FUJIFILMUSB-DRIVEUNIT", "USB-DRIVEUNIT", "*"},
330 /*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE
331 },
332 {
333 /*
334 * Nikon Coolpix 995
334 * Nikon Coolpix E775/E995 Cameras
335 */
335 */
336 {T_DIRECT, SIP_MEDIA_REMOVABLE, "NIKON", "NIKON DSC E995", "*"},
336 {T_DIRECT, SIP_MEDIA_REMOVABLE, "NIKON", "NIKON DSC E*", "*"},
337 /*quirks*/ DA_Q_NO_6_BYTE
338 },
339 {
340 /*
337 /*quirks*/ DA_Q_NO_6_BYTE
338 },
339 {
340 /*
341 * Nikon Coolpix E885 Camera
342 */
343 {T_DIRECT, SIP_MEDIA_REMOVABLE, "Nikon", "Digital Camera", "*"},
344 /*quirks*/ DA_Q_NO_6_BYTE
345 },
346 {
347 /*
341 * Minolta Dimage 2330
342 */
343 {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DIMAGE 2330*", "*"},
344 /*quirks*/ DA_Q_NO_6_BYTE
345 }
346};
347
348static d_open_t daopen;

--- 1401 unchanged lines hidden ---
348 * Minolta Dimage 2330
349 */
350 {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DIMAGE 2330*", "*"},
351 /*quirks*/ DA_Q_NO_6_BYTE
352 }
353};
354
355static d_open_t daopen;

--- 1401 unchanged lines hidden ---