diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
commit | 9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896 (patch) | |
tree | 9b071a8105704e992946dcd6b801e9fcb7635142 /audio/cdparanoia/files/patch-interface_cdda__interface.h | |
parent | MooseFS is a Fault tolerant, High Available, Highly Performing, Scale-Out, (diff) |
Cleanup patches, a* categories.
Rename them to follow the make makepatch naming, and regenerate them.
With hat: portmgr
Sponsored by: Absolight
Diffstat (limited to 'audio/cdparanoia/files/patch-interface_cdda__interface.h')
-rw-r--r-- | audio/cdparanoia/files/patch-interface_cdda__interface.h | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/audio/cdparanoia/files/patch-interface_cdda__interface.h b/audio/cdparanoia/files/patch-interface_cdda__interface.h new file mode 100644 index 000000000000..5a1e76b22cfa --- /dev/null +++ b/audio/cdparanoia/files/patch-interface_cdda__interface.h @@ -0,0 +1,50 @@ +--- interface/cdda_interface.h.orig 2001-03-24 01:15:46 UTC ++++ interface/cdda_interface.h +@@ -21,6 +21,11 @@ + #include <sys/types.h> + #include <signal.h> + ++#ifdef __FreeBSD__ ++#include <stdio.h> ++#include <camlib.h> ++#endif ++ + #define MAXTRK 100 + + typedef struct TOC { /* structure of table of contents */ +@@ -47,13 +52,19 @@ typedef struct cdrom_drive{ + int opened; /* This struct may just represent a candidate for opening */ + + char *cdda_device_name; ++#ifdef Linux + char *ioctl_device_name; + + int cdda_fd; +- int ioctl_fd; + +- char *drive_model; + int drive_type; ++#elif defined(__FreeBSD__) ++ struct cam_device *dev; ++ union ccb *ccb; ++#endif ++ ++ int ioctl_fd; ++ char *drive_model; + int interface; + int bigendianp; + int nsectors; +@@ -83,9 +94,13 @@ typedef struct cdrom_drive{ + int is_mmc; + + /* SCSI command buffer and offset pointers */ ++#ifdef Linux + unsigned char *sg; + unsigned char *sg_buffer; + unsigned char inqbytes[4]; ++#elif defined(__FreeBSD__) ++ unsigned char *sg_buffer; ++#endif + + /* Scsi parameters and state */ + unsigned char density; |