===================================================================
RCS file: /cvs/prex-old/dev/gen/ramdisk.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/dev/gen/ramdisk.c	2008/06/03 10:38:41	1.1.1.1
+++ prex-old/dev/gen/ramdisk.c	2008/08/13 17:12:23	1.1.1.1.2.1
@@ -36,16 +36,16 @@
 /* #define DEBUG_RAMDISK 1 */
 
 #ifdef DEBUG_RAMDISK
-#define rd_printf(fmt, args...)	printk("%s: " fmt, __FUNCTION__ , ## args)
+#define DPRINTF(a) printf a
 #else
-#define rd_printf(fmt...)	do {} while (0)
+#define DPRINTF(a)
 #endif
 
 /* Block size */
 #define BSIZE		512
 
-static int ramdisk_read(device_t dev, char *buf, size_t *nbyte, int blkno);
-static int ramdisk_write(device_t dev, char *buf, size_t *nbyte, int blkno);
+static int ramdisk_read(device_t, char *, size_t *, int);
+static int ramdisk_write(device_t, char *, size_t *, int);
 static int ramdisk_init(void);
 
 /*
@@ -57,6 +57,9 @@
 	/* init */	ramdisk_init,
 };
 
+/*
+ * Device I/O table
+ */
 static struct devio ramdisk_io = {
 	/* open */	NULL,
 	/* close */	NULL,
@@ -77,11 +80,12 @@
 	void *kbuf;
 	size_t nr_read;
 
-	rd_printf("read buf=%x nbyte=%d blkno=%x\n", buf, *nbyte, blkno);
+	DPRINTF(("ramdisk_read: buf=%x nbyte=%d blkno=%x\n",
+		 buf, *nbyte, blkno));
 
 	/* Check overrun */
 	if ((size_t)blkno * BSIZE > img_size) {
-		rd_printf("Overrun!\n");
+		DPRINTF(("ramdisk_read: overrun!\n"));
 		return EIO;
 	}
 	nr_read = *nbyte;
@@ -99,16 +103,14 @@
 	return 0;
 }
 
-/*
- * Data written to this device is discarded.
- */
 static int
 ramdisk_write(device_t dev, char *buf, size_t *nbyte, int blkno)
 {
 	void *kbuf;
 	size_t nr_write;
 
-	rd_printf("write buf=%x nbyte=%d blkno=%x\n", buf, *nbyte, blkno);
+	DPRINTF(("ramdisk_write: buf=%x nbyte=%d blkno=%x\n",
+		 buf, *nbyte, blkno));
 
 	/* Check overrun */
 	if ((size_t)blkno * BSIZE > img_size)
@@ -143,8 +145,9 @@
 	img_size = rd->size;
 	if (img_size == 0)
 		return -1;
-	printk("RAM disk at 0x%08x (%dK bytes)\n", img_start, img_size/1024);
-
+#ifdef DEBUG
+	printf("RAM disk at 0x%08x (%dK bytes)\n", img_start, img_size/1024);
+#endif
 	/* Create device object */
 	ramdisk_dev = device_create(&ramdisk_io, "ram0", DF_BLK);
 	ASSERT(ramdisk_dev);