From 4f0228e99f37dedd16bc56df7b3982b589cf4122 Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Sat, 6 Dec 2008 22:35:16 -0500 Subject: [PATCH] Fix bug in 0.81 release in adding NetBSD driver. Make device enumerations match internal structures. (Also corrected the name for the non-existent AIX driver.) --- include/cdio/device.h | 4 ++-- lib/driver/device.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/cdio/device.h b/include/cdio/device.h index e81d2312..f8b6051a 100644 --- a/include/cdio/device.h +++ b/include/cdio/device.h @@ -154,12 +154,12 @@ extern "C" { DRIVER_AIX, /**< AIX driver */ DRIVER_BSDI, /**< BSDI driver */ DRIVER_FREEBSD, /**< FreeBSD driver - includes CAM and ioctl access */ + DRIVER_NETBSD, /**< NetBSD Driver. */ DRIVER_LINUX, /**< GNU/Linux Driver */ DRIVER_SOLARIS, /**< Sun Solaris Driver */ DRIVER_OSX, /**< Apple OSX Driver */ DRIVER_WIN32, /**< Microsoft Windows Driver. Includes ASPI and ioctl access. */ - DRIVER_NETBSD, /**< NetBSD Driver. */ DRIVER_CDRDAO, /**< cdrdao format CD image. This is listed before BIN/CUE, to make the code prefer cdrdao over BIN/CUE when both exist. */ @@ -185,7 +185,7 @@ extern "C" { #define CDIO_MIN_DRIVER DRIVER_AIX #define CDIO_MIN_DEVICE_DRIVER CDIO_MIN_DRIVER #define CDIO_MAX_DRIVER DRIVER_NRG -#define CDIO_MAX_DEVICE_DRIVER DRIVER_NETBSD +#define CDIO_MAX_DEVICE_DRIVER DRIVER_WIN32 /** The following are status codes for completion of a given cdio operation. By design 0 is successful completion and -1 is error diff --git a/lib/driver/device.c b/lib/driver/device.c index 561865a0..844ab78f 100644 --- a/lib/driver/device.c +++ b/lib/driver/device.c @@ -109,7 +109,7 @@ CdIo_driver_t CdIo_all_drivers[CDIO_MAX_DRIVER+1] = { NULL }, - {DRIVER_BSDI, + {DRIVER_AIX, CDIO_SRC_IS_DEVICE_MASK|CDIO_SRC_IS_NATIVE_MASK|CDIO_SRC_IS_SCSI_MASK, "AIX", "AIX SCSI driver",