hal/hald/linux/drive_id drive_id.c, 1.3, 1.4 drive_id.h, 1.2, 1.3 drive_id_logging.h, NONE, 1.1

[Kay Sievers]

Update of /cvs/hal/hal/hald/linux/drive_id
In directory gabe:/tmp/cvs-serv14771/hald/linux/drive_id

Modified Files:
	drive_id.c drive_id.h 
Added Files:
	drive_id_logging.h 
Log Message:
2004-09-20  Kay Sievers  <kay.sievers at vrfy.org>

        * hald/Makefile.am: add new logging glue file for
        drive_id/

        * hald/linux/drive_id/drive_id.c: remove own dbg()
        implementation and map to the HAL logger

        * hald/linux/drive_id/drive_id.h: next version number

        * hald/linux/drive_id/drive_id_logging.h: map to
        the HAL logging function

        * hald/linux/volume_id/volume_id.h: next version number



Index: drive_id.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/drive_id/drive_id.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- drive_id.c	22 Aug 2004 19:27:22 -0000	1.3
+++ drive_id.c	20 Sep 2004 14:35:51 -0000	1.4
@@ -27,7 +27,7 @@
  */
 
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
+#define _GNU_SOURCE 1
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -48,16 +48,7 @@
 #include <asm/types.h>
 
 #include "drive_id.h"
-
-/*#define DEBUG*/
-#ifdef DEBUG
-#define dbg(format, arg...)						\
-	do {								\
-		printf("%s: " format "\n", __FUNCTION__ , ## arg);	\
-	} while (0)
-#else
-#define dbg(format, arg...)	do {} while (0)
-#endif /* DEBUG */
+#include "drive_id_logging.h"
 
 static inline void dump(unsigned char *buf, int len)
 {

Index: drive_id.h
===================================================================
RCS file: /cvs/hal/hal/hald/linux/drive_id/drive_id.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drive_id.h	1 Aug 2004 23:17:02 -0000	1.2
+++ drive_id.h	20 Sep 2004 14:35:51 -0000	1.3
@@ -21,7 +21,7 @@
 #ifndef _DRIVE_ID_H_
 #define _DRIVE_ID_H_
 
-#define DRIVE_ID_VERSION		002
+#define DRIVE_ID_VERSION		3
 
 #define DRIVE_ID_VENDOR_SIZE		8
 #define DRIVE_ID_MODEL_SIZE		40

--- NEW FILE: drive_id_logging.h ---
/*
 * drive_id_logging - this file is used to map the dbg() function
 *                     to the host logging facility
 *
 */

#ifndef _DRIVE_ID_LOGGING_H_
#define _DRIVE_ID_LOGGING_H_

#ifndef _GNU_SOURCE
#define _GNU_SOURCE 1
#endif

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#include "../../logger.h"
#define dbg(s...)	HAL_INFO((s))

#endif /* _DRIVE_ID_LOGGING_H_ */