From 883e4e4a9693e2e3094762a45c6ea16b099d6361 Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 7 May 2010 07:59:25 -0400 Subject: [PATCH 1/4] From Thomas Schmitt: in order to preserve the current behavior over the CAM changes. --- lib/driver/FreeBSD/freebsd_cam.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/driver/FreeBSD/freebsd_cam.c b/lib/driver/FreeBSD/freebsd_cam.c index a7e26873..df4c3923 100644 --- a/lib/driver/FreeBSD/freebsd_cam.c +++ b/lib/driver/FreeBSD/freebsd_cam.c @@ -57,7 +57,7 @@ run_mmc_cmd_freebsd_cam( void *p_user_data, unsigned int i_timeout_ms, { _img_private_t *p_env = p_user_data; int i_status, sense_size; - int direction = CAM_DEV_QFRZDIS; + int direction = CAM_DEV_QFRZDIS | CAM_PASS_ERR_RECOVER; union ccb ccb; p_env->gen.scsi_mmc_sense_valid = 0; From 7d52ffcac04e9c7ed2915e7aafe2c8fdcab7de0a Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Tue, 11 May 2010 10:51:26 -0400 Subject: [PATCH 2/4] Typo found by Thomas Schmitt. --- include/cdio/mmc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/cdio/mmc.h b/include/cdio/mmc.h index 2423147b..e21a9d70 100644 --- a/include/cdio/mmc.h +++ b/include/cdio/mmc.h @@ -121,7 +121,7 @@ extern "C" { CDIO_MMC_SENSE_KEY_VENDOR_SPECIFIC = 9, CDIO_MMC_SENSE_KEY_COPY_ABORTED = 10, CDIO_MMC_SENSE_KEY_ABORTED_COMMAND = 11, - CDIO_MMC_SENSE_KEY_OBSOLTE = 12, + CDIO_MMC_SENSE_KEY_OBSOLETE = 12, } cdio_mmc_sense_key_t; /** From ba610a057559613fbebf8579359e44d3c892e250 Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Tue, 11 May 2010 13:34:27 -0400 Subject: [PATCH 3/4] Silence another GCC warning. Thanks to Thomas Schmitt for this. --- src/cdda-player.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cdda-player.c b/src/cdda-player.c index 82edaa4a..7ba91c9f 100644 --- a/src/cdda-player.c +++ b/src/cdda-player.c @@ -1,7 +1,7 @@ /* $Id: cdda-player.c,v 1.50 2008/06/19 15:44:14 flameeyes Exp $ - Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein + Copyright (C) 2005, 2006, 2008, 2009, 2010 Rocky Bernstein Adapted from Gerd Knorr's player.c program Copyright (C) 1997, 1998 @@ -851,7 +851,7 @@ get_track_info(track_t i_track) } #define display_line(LINE_NO, COL_NO, format_str, field) \ - if (field && field[0]) { \ + if (field != NULL && field[0]) { \ mvprintw(LINE_NO, COL_NO, (char *) format_str " [%s]", \ field, \ b_cdtext_ ## field ? "CD-Text": "CDDB"); \ From e6b6353cb87d6af4c01a4bcff5e0fc118807f98b Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Tue, 11 May 2010 13:55:08 -0400 Subject: [PATCH 4/4] uint8_t -> unsigned int. http://en.wikipedia.org/wiki/C_syntax#Bit_fields via Thomas Schmitt --- include/cdio/dvd.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/cdio/dvd.h b/include/cdio/dvd.h index b9ed9e10..8bb83e12 100644 --- a/include/cdio/dvd.h +++ b/include/cdio/dvd.h @@ -58,16 +58,16 @@ #define CDIO_DVD_BOOK_DVD_PR_DL 0xe /**< DVD+R DL */ typedef struct cdio_dvd_layer { - uint8_t book_version : 4; - uint8_t book_type : 4; - uint8_t min_rate : 4; - uint8_t disc_size : 4; - uint8_t layer_type : 4; - uint8_t track_path : 1; - uint8_t nlayers : 2; - uint8_t track_density : 4; - uint8_t linear_density: 4; - uint8_t bca : 1; + unsigned int book_version : 4; + unsigned int book_type : 4; + unsigned int min_rate : 4; + unsigned int disc_size : 4; + unsigned int layer_type : 4; + unsigned int track_path : 1; + unsigned int nlayers : 2; + unsigned int track_density : 4; + unsigned int linear_density : 4; + unsigned int bca : 1; uint32_t start_sector; uint32_t end_sector; uint32_t end_sector_l0;