From 87ff916adb263076c136a7232693e9bbe80a0f1e Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 19 Feb 2014 11:11:50 +0000 Subject: [PATCH] Removed Linux compilability mock-up from sg-netbsd.c --- libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/libburn/os.h | 2 +- libburn/trunk/libburn/sg-netbsd.c | 64 ----------------------- libburn/trunk/libburn/sg.c | 2 +- 4 files changed, 3 insertions(+), 67 deletions(-) diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 7e75b0cb..afd9c998 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2014.02.16.203859" +#define Cdrskin_timestamP "2014.02.19.111017" diff --git a/libburn/trunk/libburn/os.h b/libburn/trunk/libburn/os.h index d10346fc..9ed5e158 100644 --- a/libburn/trunk/libburn/os.h +++ b/libburn/trunk/libburn/os.h @@ -15,7 +15,7 @@ */ -/* <<< Only for the time of Linux compilability tests */ +/* <<< Until it is known whether this adapter would work on OpenBSD too */ #ifdef __NetBSD__ #define Libburn_use_sg_netbsD #endif diff --git a/libburn/trunk/libburn/sg-netbsd.c b/libburn/trunk/libburn/sg-netbsd.c index 68e7e04d..4a9a472b 100644 --- a/libburn/trunk/libburn/sg-netbsd.c +++ b/libburn/trunk/libburn/sg-netbsd.c @@ -120,72 +120,8 @@ Send feedback to libburn-hackers@pykix.org . #endif /* Libburn_os_has_stavtfS */ #include - - -/* <<< Porting mock-up to check general compilability by a Linux system - before bothering Freddy Fisker and his NetBSD . - Mostly from NetBSD 6 : /sys/scsiio.h - - *** Do not run the resulting binary *** - -*/ -#ifdef __linux - -#define SENSEBUFLEN 48 - -struct scsireq { - unsigned int flags; /* info about the request status and type */ - unsigned int timeout; - unsigned char cmd[16]; /* 12 is actually the max */ - unsigned char cmdlen; - void * databuf; /* address in user space of buffer */ - unsigned int datalen; /* size of user buffer (request) */ - unsigned int datalen_used; /* size of user buffer (used)*/ - unsigned char sense[SENSEBUFLEN]; /* returned sense will be in here */ - unsigned char senselen; /* sensedata request size (MAX of SENSEBUFLEN)*/ - unsigned char senselen_used; /* return value only */ - unsigned char status; /* what the scsi status was from the adapter */ - unsigned char retsts; /* the return status for the command */ - int error; /* error bits */ -}; -typedef struct scsireq scsireq_t; - -#define SCCMD_READ 0x00000001 -#define SCCMD_WRITE 0x00000002 -#define SCCMD_ESCAPE 0x00000010 - -#define SCCMD_OK 0x00 -#define SCCMD_SENSE 0x03 - -/* extra dummy values */ -#define SCIOCCOMMAND 12345 -#define SCIOCIDENTIFY 67890 - -struct oscsi_addr { - int scbus; /* -1 if wildcard */ - int target; /* -1 if wildcard */ - int lun; /* -1 if wildcard */ -}; - -struct scsi_addr { - int type; /* bus type */ -#define TYPE_SCSI 0 -#define TYPE_ATAPI 1 - union { - struct oscsi_addr scsi; - struct _atapi { - int atbus; /* -1 if wildcard */ - int drive; /* -1 if wildcard */ - } atapi; - } addr; -}; - -#else /* Linux compilability mock-up */ - #include -#endif /* ! Linux compilability mock-up */ - /** PORTING : ------ libburn portable headers and definitions ----- */ diff --git a/libburn/trunk/libburn/sg.c b/libburn/trunk/libburn/sg.c index 6be42f8b..12079de2 100644 --- a/libburn/trunk/libburn/sg.c +++ b/libburn/trunk/libburn/sg.c @@ -11,7 +11,7 @@ #endif -/* <<< Only for the time of Linux compilability tests */ +/* <<< Until it is known whether this adapter would work on OpenBSD too */ #ifdef __NetBSD__ #define Libburn_use_sg_netbsD #endif