 @@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.29 2010/12/15 21:08:30 chuck Exp $
+$NetBSD: distinfo,v 1.30 2010/12/16 04:55:46 chuck Exp $
 SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
 RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
 Size (cdparanoia-III-10.2.src.tgz) = 183236 bytes
 SHA1 (patch-aa) = e00476e557772f97e1588650bbfab19a985a7921
 SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44
 SHA1 (patch-ac) = bd79af2f7544aa7e1c55150c761870887b49a160
 SHA1 (patch-ad) = f0c79049cbc26e9483c410f00cb6df85c280c145
 SHA1 (patch-ae) = dda320ca0817b06cb25be86b2a891776550603ae
 SHA1 (patch-ba) = 0f4f8ddecd9f5f273f7a1687bbb1477fd64500c1
 SHA1 (patch-ca) = 9860c2227f9d359e808c0ee0989020a9a3163a48
-SHA1 (patch-cb) = 31891b99826876e8c16ecc7688972087c49f53ac
+SHA1 (patch-cb) = 48c05accf3b235a2a1bb168b88cad6e8936169b1
 SHA1 (patch-cc) = e692c8f4a9811123baa6cb25c09dea0004cc9b68
 SHA1 (patch-cd) = 7141563e10b0d23dbd4ff824224a10908741be5b
 SHA1 (patch-ce) = b343191fa2e337e2c3c091c585451c726c1f745b
 SHA1 (patch-cf) = 8d204272dace7bb1d3238e44f6ff152ab38f0930
 SHA1 (patch-cg) = fd92ca2b999c4d25ddbe5abe5f384c5c83019624
-SHA1 (patch-ch) = 37c8e5e675ed8db8ae7768918bea28d509a0563c
+SHA1 (patch-ch) = 4b0a232bc21fc57777897269139894428d11016b
-SHA1 (patch-ci) = 0b334f818b35871856f386f77e0bce935ab1b3d0
+SHA1 (patch-ci) = dabc5121436aee0efde4cda8a01903d918cb8e4a
 SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
 SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
 SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475

 @@ -1,17 +1,17 @@
-$NetBSD: patch-cb,v 1.7 2009/08/29 04:54:52 hasso Exp $
+$NetBSD: patch-cb,v 1.8 2010/12/16 04:55:46 chuck Exp $
---- interface/low_interface.h.orig	2008-09-11 13:43:52 +0300
+--- interface/low_interface.h.orig	2008-09-11 06:43:52.000000000 -0400
-+++ interface/low_interface.h	2009-08-26 10:00:01 +0300
++++ interface/low_interface.h	2010-12-15 23:40:19.000000000 -0500
 @@ -26,6 +26,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
 +#ifdef __linux__
  #include <linux/major.h>
  #include <linux/version.h>
 @@ -54,6 +55,22 @@
  #include <linux/cdrom.h>
  #include <linux/major.h>
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 @@ -23,27 +23,38 @@ $NetBSD: patch-cb,v 1.7 2009/08/29 04:54
 +#include <cam/scsi/scsi_message.h>
 +#include <cam/scsi/scsi_sg.h>
 +#include <camlib.h>
++
 +#elif defined(__NetBSD__)
++
 +#include <sys/scsiio.h>
 +#include <sys/cdio.h>
 +#endif
++
  #include "cdda_interface.h"
  #ifndef SG_EMULATED_HOST
-@@ -107,10 +124,18 @@ struct cdda_private_data {
+@@ -100,17 +117,29 @@
  struct cdda_private_data {
    struct sg_header *sg_hd;
    unsigned char *sg_buffer; /* points into sg_hd */
 +#if defined(__APPLE__) && defined(__MACH__)
 +  /* don't need clock */
 +#else
    clockid_t clock;
 +#endif
    int last_milliseconds;
  };
  #define MAX_RETRIES 8
  #define MAX_BIG_BUFF_SIZE 65536
  #define MIN_BIG_BUFF_SIZE 4096
 +#ifdef __linux__
  #define SG_OFF sizeof(struct sg_header)
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#define SG_OFF (0)
 +#elif defined(__NetBSD__)
 +#define SG_OFF sizeof(scsireq_t)
 +#endif
  extern int  cooked_init_drive (cdrom_drive *d);
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)

 @@ -1,51 +1,51 @@
-$NetBSD: patch-ch,v 1.6 2009/08/29 04:54:52 hasso Exp $
+$NetBSD: patch-ch,v 1.7 2010/12/16 04:55:46 chuck Exp $
---- interface/cdda_interface.h.orig	2008-09-11 13:43:52 +0300
+--- interface/cdda_interface.h.orig	2008-09-11 06:43:52.000000000 -0400
-+++ interface/cdda_interface.h	2009-08-28 11:50:44 +0300
++++ interface/cdda_interface.h	2010-12-15 23:39:17.000000000 -0500
 @@ -18,9 +18,24 @@
  #endif
  #define CD_FRAMESAMPLES (CD_FRAMESIZE_RAW / 4)
 +#if defined(__APPLE__) && defined(__MACH__)
 +#include <IOKit/IOKitLib.h>
 +#include <IOKit/storage/IOCDTypes.h>
 +#endif
++
  #include <sys/types.h>
  #include <signal.h>
 +#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#define CAM_NO_SCSI_INQUIRY
 +#include <stdio.h>
 +#include <camlib.h>
 +#endif
++
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || (defined(__APPLE__) && defined(__MACH__))
 +#define ENOMEDIUM 12345
 +#endif
++
  #define MAXTRK 100
  typedef struct TOC {	/* structure of table of contents */
-@@ -35,6 +50,7 @@ typedef struct TOC {	/* structure of tab
+@@ -35,6 +50,7 @@
  #define TEST_INTERFACE	 2
  #define SGIO_SCSI	 3
  #define SGIO_SCSI_BUGGY1 4
 +#define OSX_IOKIT        5
  #define CDDA_MESSAGE_FORGETIT 0
  #define CDDA_MESSAGE_PRINTIT 1
-@@ -49,13 +65,27 @@ typedef struct cdrom_drive{
+@@ -49,13 +65,27 @@
    int opened; /* This struct may just represent a candidate for opening */
    char *cdda_device_name;
 +#if !defined(__FreeBSD__)
    char *ioctl_device_name;
    int cdda_fd;
 -  int ioctl_fd;
 -  char *drive_model;
    int drive_type;
 +#else
 +  struct cam_device *dev;
 @@ -55,22 +55,22 @@ $NetBSD: patch-ch,v 1.6 2009/08/29 04:54
 +#if defined(__APPLE__) && defined(__MACH__)
 +  io_object_t io;
 +  int fd;
 +  char *dev;
 +  CDTOC *raw_toc;
 +  int descriptor_count;
 +#endif
++
 +  int ioctl_fd;
 +  char *drive_model;
    int interface;
    int bigendianp;
    int nsectors;
-@@ -84,7 +114,7 @@ typedef struct cdrom_drive{
+@@ -84,7 +114,7 @@
    int is_atapi;
    int is_mmc;
 -  cdda_private_data_t *private;
 +  cdda_private_data_t *private_data;
    void         *reserved;
    unsigned char inqbytes[4];

 @@ -1,17 +1,17 @@
-$NetBSD: patch-ci,v 1.8 2010/03/26 16:38:32 jdc Exp $
+$NetBSD: patch-ci,v 1.9 2010/12/16 04:55:46 chuck Exp $
---- interface/interface.c.orig	2008-09-11 10:43:52.000000000 +0000
+--- interface/interface.c.orig	2008-09-11 06:43:52.000000000 -0400
-+++ interface/interface.c	2010-03-24 13:57:38.000000000 +0000
++++ interface/interface.c	2010-12-15 23:41:29.000000000 -0500
 @@ -35,6 +35,10 @@
      _clean_messages(d);
      if(d->cdda_device_name)free(d->cdda_device_name);
 +#if !defined(__FreeBSD__)
 +#if defined(__APPLE__) && defined(__MACH__)
 +    if(d->fd != -1) close(d->fd);
 +#else
      if(d->ioctl_device_name)free(d->ioctl_device_name);
      if(d->drive_model)free(d->drive_model);
      if(d->cdda_fd!=-1)close(d->cdda_fd);
 @@ -43,6 +47,19 @@
        if(d->private->sg_hd)free(d->private->sg_hd);
 @@ -64,13 +64,24 @@ $NetBSD: patch-ci,v 1.8 2010/03/26 16:38
 +#endif
    default:
      cderror(d,"100: Interface not supported\n");
      return(-100);
 @@ -113,7 +139,7 @@
      if(sectors>0){
        sectors=d->read_audio(d,buffer,beginsector,sectors);
 -      if(sectors>0){
 +      if(sectors>0 && buffer != NULL){
  	/* byteswap? */
  	if(d->bigendianp==-1) /* not determined yet */
  	  d->bigendianp=data_bigendianp(d);
@@ -127,7 +153,9 @@
+ 	}
+       }
+     }
 -    if(ms)*ms=d->private->last_milliseconds;
 +    if(ms) {
 +      *ms = (d->private == NULL) ? 0 : d->private->last_milliseconds;
 +    }
      return(sectors);
+   }