diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2007-06-27 03:20:52 +0000 |
---|---|---|
committer | Douglas Gilbert <dgilbert@interlog.com> | 2007-06-27 03:20:52 +0000 |
commit | 68f4f8dd3682a586c2b082b115c1e4166a3146dd (patch) | |
tree | ce060fd9dfffd4d9ef72db58c73632a6ed659fcf /archive | |
parent | 3e7335214bdf0173b615311b1f0c5f8297ff2f46 (diff) | |
download | sg3_utils-68f4f8dd3682a586c2b082b115c1e4166a3146dd.tar.gz |
Load sg3_utils-1.19 into trunk/.
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@65 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'archive')
-rw-r--r-- | archive/Makefile | 8 | ||||
-rw-r--r-- | archive/scsi_devfs_scan.c | 2 | ||||
-rw-r--r-- | archive/sg_bus_xfer.c | 2 | ||||
-rw-r--r-- | archive/sg_dd2048.c | 2 | ||||
-rw-r--r-- | archive/sg_dd512.c | 2 | ||||
-rw-r--r-- | archive/sg_dd_old.c | 2 | ||||
-rw-r--r-- | archive/sg_debug.c | 2 | ||||
-rw-r--r-- | archive/sg_hold.c | 2 | ||||
-rw-r--r-- | archive/sg_include.h | 56 | ||||
l--------- | archive/sg_io_linux.h | 1 | ||||
l--------- | archive/sg_linux_inc.h | 1 | ||||
-rw-r--r-- | archive/sg_poll.c | 2 | ||||
-rw-r--r-- | archive/sgq_dd.c | 2 | ||||
-rw-r--r-- | archive/sgq_dd.c.orig | 2 | ||||
-rw-r--r-- | archive/sgq_old_dd.c | 2 | ||||
-rw-r--r-- | archive/sgs_dd.c | 2 |
16 files changed, 18 insertions, 72 deletions
diff --git a/archive/Makefile b/archive/Makefile index eabe5f9c..a2848016 100644 --- a/archive/Makefile +++ b/archive/Makefile @@ -29,13 +29,13 @@ depend dep: clean: /bin/rm -f *.o $(EXECS) core .depend -sg_poll: sg_poll.o ../sg_lib.o +sg_poll: sg_poll.o ../sg_lib.o ../sg_io_linux.o $(LD) -o $@ $(LDFLAGS) $^ -sgq_dd: sgq_dd.o ../sg_lib.o ../llseek.o +sgq_dd: sgq_dd.o ../sg_lib.o ../sg_io_linux.o ../llseek.o $(LD) -o $@ $(LDFLAGS) $^ -sg_bus_xfer: sg_bus_xfer.o ../sg_lib.o +sg_bus_xfer: sg_bus_xfer.o ../sg_lib.o ../sg_io_linux.o $(LD) -o $@ $(LDFLAGS) $^ sg_hold: sg_hold.o @@ -44,7 +44,7 @@ sg_hold: sg_hold.o isosize: isosize.o $(LD) -o $@ $(LDFLAGS) $^ -scsi_devfs_scan: scsi_devfs_scan.o ../sg_lib.o +scsi_devfs_scan: scsi_devfs_scan.o ../sg_lib.o ../sg_io_linux.o $(LD) -o $@ $(LDFLAGS) $^ sg_debug: sg_debug.o diff --git a/archive/scsi_devfs_scan.c b/archive/scsi_devfs_scan.c index bf23a3fc..6cd526a0 100644 --- a/archive/scsi_devfs_scan.c +++ b/archive/scsi_devfs_scan.c @@ -13,8 +13,8 @@ #include <dirent.h> #include <errno.h> #include <unistd.h> -#include "sg_include.h" #include "sg_lib.h" +#include "sg_io_linux.h" /* Code for scanning for SCSI devices within a Linux device pseudo file system. diff --git a/archive/sg_bus_xfer.c b/archive/sg_bus_xfer.c index 5fd45e5a..eada35fd 100644 --- a/archive/sg_bus_xfer.c +++ b/archive/sg_bus_xfer.c @@ -8,8 +8,8 @@ #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> -#include "sg_include.h" #include "sg_lib.h" +#include "sg_io_linux.h" /* Test code for D. Gilbert's extensions to the Linux OS SCSI generic ("sg") device driver. diff --git a/archive/sg_dd2048.c b/archive/sg_dd2048.c index 4e02a0ad..9e88683e 100644 --- a/archive/sg_dd2048.c +++ b/archive/sg_dd2048.c @@ -8,8 +8,8 @@ #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> -#include "sg_include.h" #include "sg_lib.h" +#include "sg_linux_inc.h" /* Test code for D. Gilbert's extensions to the Linux OS SCSI generic ("sg") device driver. diff --git a/archive/sg_dd512.c b/archive/sg_dd512.c index 8740ff0f..ebb92bc6 100644 --- a/archive/sg_dd512.c +++ b/archive/sg_dd512.c @@ -8,8 +8,8 @@ #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> -#include "sg_include.h" #include "sg_lib.h" +#include "sg_linux_inc.h" /* Test code for D. Gilbert's extensions to the Linux OS SCSI generic ("sg") device driver. diff --git a/archive/sg_dd_old.c b/archive/sg_dd_old.c index 5553fc30..fbdb19b7 100644 --- a/archive/sg_dd_old.c +++ b/archive/sg_dd_old.c @@ -8,8 +8,8 @@ #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> -#include "sg_include.h" #include "sg_lib.h" +#include "sg_linux_inc.h" /* A utility program for the Linux OS SCSI generic ("sg") device driver. * Copyright (C) 1999 D. Gilbert and P. Allworth diff --git a/archive/sg_debug.c b/archive/sg_debug.c index fb044feb..c29b87b3 100644 --- a/archive/sg_debug.c +++ b/archive/sg_debug.c @@ -6,7 +6,7 @@ #include <sys/stat.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -#include "sg_include.h" +#include "sg_linux_inc.h" /* Test code for D. Gilbert's extensions to the Linux OS SCSI generic ("sg") diff --git a/archive/sg_hold.c b/archive/sg_hold.c index da8a56af..01c73d35 100644 --- a/archive/sg_hold.c +++ b/archive/sg_hold.c @@ -7,7 +7,7 @@ #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> -#include "sg_include.h" +#include "sg_linux_inc.h" /* This is a program that periodically executes a TEST UNIT READY SCSI command using the SCSI generic (sg) driver. diff --git a/archive/sg_include.h b/archive/sg_include.h deleted file mode 100644 index b7310ec0..00000000 --- a/archive/sg_include.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef SG_INCLUDES_H -#define SG_INCLUDES_H - -#ifdef SG_KERNEL_INCLUDES - #define __user - typedef unsigned char u8; - #include "/usr/src/linux/include/scsi/sg.h" - #include "/usr/src/linux/include/scsi/scsi.h" -#else - #ifdef SG_TRICK_GNU_INCLUDES - #include <linux/../scsi/sg.h> - #include <linux/../scsi/scsi.h> - #else - #include <scsi/sg.h> - #include <scsi/scsi.h> - #endif -#endif - -#ifdef BLKGETSIZE64 - #ifndef u64 - #include <stdint.h> /* C99 header for exact integer types */ - typedef uint64_t u64; /* problems with BLKGETSIZE64 ioctl in lk 2.4 */ - #endif -#endif - -/* - Getting the correct include files for the sg interface can be an ordeal. - In a perfect world, one would just write: - #include <scsi/sg.h> - #include <scsi/scsi.h> - This would include the files found in the /usr/include/scsi directory. - Those files are maintained with the GNU library which may or may not - agree with the kernel and version of sg driver that is running. Any - many cases this will not matter. However in some it might, for example - glibc 2.1's include files match the sg driver found in the lk 2.2 - series. Hence if glibc 2.1 is used with lk 2.4 then the additional - sg v3 interface will not be visible. - If this is a problem then defining SG_KERNEL_INCLUDES will access the - kernel supplied header files (assuming they are in the normal place). - The GNU library maintainers and various kernel people don't like - this approach (but it does work). - The technique selected by defining SG_TRICK_GNU_INCLUDES worked (and - was used) prior to glibc 2.2 . Prior to that version /usr/include/linux - was a symbolic link to /usr/src/linux/include/linux . - - There are other approaches if this include "mixup" causes pain. These - would involve include files being copied or symbolic links being - introduced. - - Sorry about the inconvenience. Typically neither SG_KERNEL_INCLUDES - nor SG_TRICK_GNU_INCLUDES is defined. - - dpg 20010415, 20030522 -*/ - -#endif diff --git a/archive/sg_io_linux.h b/archive/sg_io_linux.h new file mode 120000 index 00000000..6c9c2ba9 --- /dev/null +++ b/archive/sg_io_linux.h @@ -0,0 +1 @@ +../sg_io_linux.h
\ No newline at end of file diff --git a/archive/sg_linux_inc.h b/archive/sg_linux_inc.h new file mode 120000 index 00000000..55808134 --- /dev/null +++ b/archive/sg_linux_inc.h @@ -0,0 +1 @@ +../sg_linux_inc.h
\ No newline at end of file diff --git a/archive/sg_poll.c b/archive/sg_poll.c index 8dcf6f0b..e6fb28f8 100644 --- a/archive/sg_poll.c +++ b/archive/sg_poll.c @@ -13,8 +13,8 @@ #include <sys/poll.h> #include <sys/ipc.h> #include <sys/sem.h> -#include "sg_include.h" #include "sg_lib.h" +#include "sg_io_linux.h" /* Test code for D. Gilbert's extensions to the Linux OS SCSI generic ("sg") device driver. diff --git a/archive/sgq_dd.c b/archive/sgq_dd.c index 84d03904..8bc4aeef 100644 --- a/archive/sgq_dd.c +++ b/archive/sgq_dd.c @@ -17,8 +17,8 @@ #include <linux/major.h> #include <sys/time.h> typedef unsigned char u_char; /* horrible, for scsi.h */ -#include "sg_include.h" #include "sg_lib.h" +#include "sg_io_linux.h" #include "llseek.h" /* A utility program for the Linux OS SCSI generic ("sg") device driver. diff --git a/archive/sgq_dd.c.orig b/archive/sgq_dd.c.orig index 644e9750..c55280ea 100644 --- a/archive/sgq_dd.c.orig +++ b/archive/sgq_dd.c.orig @@ -17,8 +17,8 @@ #include <linux/major.h> #include <sys/time.h> typedef unsigned char u_char; /* horrible, for scsi.h */ -#include "sg_include.h" #include "sg_lib.h" +#include "sg_linux_inc.h" #include "llseek.h" /* A utility program for the Linux OS SCSI generic ("sg") device driver. diff --git a/archive/sgq_old_dd.c b/archive/sgq_old_dd.c index dd20efe3..854e44fe 100644 --- a/archive/sgq_old_dd.c +++ b/archive/sgq_old_dd.c @@ -9,8 +9,8 @@ #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> -#include "sg_include.h" #include "sg_lib.h" +#include "sg_linux_inc.h" /* A utility program for the Linux OS SCSI generic ("sg") device driver. * Copyright (C) 1999 D. Gilbert and P. Allworth diff --git a/archive/sgs_dd.c b/archive/sgs_dd.c index ecac72de..4c68d90c 100644 --- a/archive/sgs_dd.c +++ b/archive/sgs_dd.c @@ -13,8 +13,8 @@ #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> -#include "sg_include.h" #include "sg_lib.h" +#include "sg_linux_inc.h" /* Test code for the extensions to the Linux OS SCSI generic ("sg") device driver. |