diff --git a/include/cdio/Makefile.am b/include/cdio/Makefile.am index 8e620b20..e1ef076d 100644 --- a/include/cdio/Makefile.am +++ b/include/cdio/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.8 2003/08/31 07:39:45 rocky Exp $ +# $Id: Makefile.am,v 1.9 2004/05/10 03:28:51 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -28,6 +28,7 @@ libcdioinclude_HEADERS = \ iso9660.h \ logging.h \ sector.h \ + scsi_mmc.h \ types.h \ util.h \ version.h \ diff --git a/lib/scsi_mmc.h b/include/cdio/scsi_mmc.h similarity index 97% rename from lib/scsi_mmc.h rename to include/cdio/scsi_mmc.h index 7ccac0ed..399b6a10 100644 --- a/lib/scsi_mmc.h +++ b/include/cdio/scsi_mmc.h @@ -1,5 +1,5 @@ /* - $Id: scsi_mmc.h,v 1.10 2004/04/30 21:36:53 rocky Exp $ + $Id: scsi_mmc.h,v 1.1 2004/05/10 03:28:52 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein diff --git a/include/cdio/sector.h b/include/cdio/sector.h index c9f1b8d6..565d5de9 100644 --- a/include/cdio/sector.h +++ b/include/cdio/sector.h @@ -1,8 +1,8 @@ /* - $Id: sector.h,v 1.10 2004/05/10 02:10:05 rocky Exp $ + $Id: sector.h,v 1.11 2004/05/10 03:28:52 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel - Copyright (C) 2003 Rocky Bernstein + Copyright (C) 2003, 2004 Rocky Bernstein This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/FreeBSD/freebsd_cam.c b/lib/FreeBSD/freebsd_cam.c index 486477bd..46618487 100644 --- a/lib/FreeBSD/freebsd_cam.c +++ b/lib/FreeBSD/freebsd_cam.c @@ -1,5 +1,5 @@ /* - $Id: freebsd_cam.c,v 1.7 2004/05/08 16:28:44 rocky Exp $ + $Id: freebsd_cam.c,v 1.8 2004/05/10 03:28:55 rocky Exp $ Copyright (C) 2004 Rocky Bernstein @@ -26,12 +26,12 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.7 2004/05/08 16:28:44 rocky Exp $"; +static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.8 2004/05/10 03:28:55 rocky Exp $"; #ifdef HAVE_FREEBSD_CDROM #include "freebsd.h" -#include "scsi_mmc.h" +#include static const u_char scsi_cdblen[8] = {6, 10, 10, 12, 12, 12, 10, 10}; diff --git a/lib/MSWindows/aspi32.c b/lib/MSWindows/aspi32.c index 7852e46b..91a2425d 100644 --- a/lib/MSWindows/aspi32.c +++ b/lib/MSWindows/aspi32.c @@ -1,5 +1,5 @@ /* - $Id: aspi32.c,v 1.4 2004/04/30 22:28:00 rocky Exp $ + $Id: aspi32.c,v 1.5 2004/05/10 03:28:55 rocky Exp $ Copyright (C) 2004 Rocky Bernstein @@ -27,13 +27,13 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: aspi32.c,v 1.4 2004/04/30 22:28:00 rocky Exp $"; +static const char _rcsid[] = "$Id: aspi32.c,v 1.5 2004/05/10 03:28:55 rocky Exp $"; #include #include #include +#include #include "cdio_assert.h" -#include "scsi_mmc.h" #include diff --git a/lib/MSWindows/win32.c b/lib/MSWindows/win32.c index 2b90ff67..ded647dd 100644 --- a/lib/MSWindows/win32.c +++ b/lib/MSWindows/win32.c @@ -1,5 +1,5 @@ /* - $Id: win32.c,v 1.13 2004/05/08 14:14:03 rocky Exp $ + $Id: win32.c,v 1.14 2004/05/10 03:28:56 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein @@ -26,14 +26,14 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: win32.c,v 1.13 2004/05/08 14:14:03 rocky Exp $"; +static const char _rcsid[] = "$Id: win32.c,v 1.14 2004/05/10 03:28:56 rocky Exp $"; #include #include #include +#include #include "cdio_assert.h" #include "cdio_private.h" /* protoype for cdio_is_device_win32 */ -#include "scsi_mmc.h" #include diff --git a/lib/MSWindows/win32_ioctl.c b/lib/MSWindows/win32_ioctl.c index 823f598e..1eea0015 100644 --- a/lib/MSWindows/win32_ioctl.c +++ b/lib/MSWindows/win32_ioctl.c @@ -1,5 +1,5 @@ /* - $Id: win32_ioctl.c,v 1.2 2004/05/06 04:01:52 rocky Exp $ + $Id: win32_ioctl.c,v 1.3 2004/05/10 03:28:57 rocky Exp $ Copyright (C) 2004 Rocky Bernstein @@ -26,7 +26,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.2 2004/05/06 04:01:52 rocky Exp $"; +static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.3 2004/05/10 03:28:57 rocky Exp $"; #include #include @@ -43,8 +43,7 @@ static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.2 2004/05/06 04:01:52 rocky #include /* offsetof() macro */ #include #include - -#include "scsi_mmc.h" +#include /* Win32 DeviceIoControl specifics */ /***** FIXME: #include ntddcdrm.h from Wine, but probably need to diff --git a/lib/Makefile.am b/lib/Makefile.am index 74d00f93..ddd56e6b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.34 2004/05/04 02:06:48 rocky Exp $ +# $Id: Makefile.am,v 1.35 2004/05/10 03:28:53 rocky Exp $ # # Copyright (C) 2003, 2004 Rocky Bernstein # @@ -81,7 +81,6 @@ libcdio_sources = \ MSWindows/win32_ioctl.c \ MSWindows/win32.c \ MSWindows/win32.h \ - scsi_mmc.h \ sector.c \ util.c diff --git a/lib/_cdio_linux.c b/lib/_cdio_linux.c index bbbee032..ae4a4035 100644 --- a/lib/_cdio_linux.c +++ b/lib/_cdio_linux.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_linux.c,v 1.44 2004/05/06 01:21:29 rocky Exp $ + $Id: _cdio_linux.c,v 1.45 2004/05/10 03:28:54 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -27,15 +27,15 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.44 2004/05/06 01:21:29 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.45 2004/05/10 03:28:54 rocky Exp $"; #include #include #include +#include #include "cdio_assert.h" #include "cdio_private.h" -#include "scsi_mmc.h" #ifdef HAVE_LINUX_CDROM diff --git a/lib/_cdio_sunos.c b/lib/_cdio_sunos.c index 8cf735d0..81f5ab7d 100644 --- a/lib/_cdio_sunos.c +++ b/lib/_cdio_sunos.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_sunos.c,v 1.31 2004/05/06 01:08:43 rocky Exp $ + $Id: _cdio_sunos.c,v 1.32 2004/05/10 03:28:54 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -33,15 +33,15 @@ #include #include #include +#include #include "cdio_assert.h" #include "cdio_private.h" -#include "scsi_mmc.h" #define DEFAULT_CDIO_DEVICE "/vol/dev/aliases/cdrom0" #ifdef HAVE_SOLARIS_CDROM -static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.31 2004/05/06 01:08:43 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.32 2004/05/10 03:28:54 rocky Exp $"; #include #include