hal: Branch 'master'

[Danny Kukawka]

 hald/linux/probing/linux_dvd_rw_utils.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
diff-tree 72510af187df46dfc2cc268d51ca2d47f4bb3b89 (from 60d18a1852680559c8db96e25e09e62048ad3669)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Tue Aug 28 11:10:17 2007 +0200

    handle renaming of SG_FLAG_LUN_INHIBIT in sg.h
    
    > while fixing sg_ui.sbp is relatively easy (just add cast), what
    > SG_FLAG_LUN_INHIBIT is supposed to do and what should be used instead?
    
    I've attached an improved patch (inspired from k3b).

diff --git a/hald/linux/probing/linux_dvd_rw_utils.c b/hald/linux/probing/linux_dvd_rw_utils.c
index a75a091..7431f1b 100644
--- a/hald/linux/probing/linux_dvd_rw_utils.c
+++ b/hald/linux/probing/linux_dvd_rw_utils.c
@@ -58,6 +58,14 @@
 
 #include "linux_dvd_rw_utils.h"
 
+#if !defined(SG_FLAG_LUN_INHIBIT)
+# if defined(SG_FLAG_UNUSED_LUN_INHIBIT)
+#  define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT
+# else
+#  define SG_FLAG_LUN_INHIBIT 0
+# endif
+#endif
+
 typedef enum {
 	NONE = CGC_DATA_NONE,	// 3
 	READ = CGC_DATA_READ,	// 2
@@ -149,8 +157,8 @@ scsi_command_transport (ScsiCommand * cm
 		errno = EIO;
 		ret = -1;
 		if (cmd->sg_io.masked_status & CHECK_CONDITION) {
-			CREAM_ON_ERRNO (cmd->sg_io.sbp);
-			ret = ERRCODE (cmd->sg_io.sbp);
+			CREAM_ON_ERRNO ((unsigned char*)cmd->sg_io.sbp);
+			ret = ERRCODE ((unsigned char*)cmd->sg_io.sbp);
 			if (ret == 0)
 				ret = -1;
 		}