blob-cvs-commit

[Stefan E. <se...@us...>]

Update of /cvsroot/blob/blob/src/lib
In directory usw-pr-cvs1:/tmp/cvs-serv23823

Modified Files:
	pcmcia.c 
Log Message:
- BUGFIX: MEMb() macro was using u16 instead of u8.
- corrected the previous checked in fixes


Index: pcmcia.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/pcmcia.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pcmcia.c	29 Apr 2002 18:13:36 -0000	1.5
+++ pcmcia.c	30 Apr 2002 19:00:29 -0000	1.6
@@ -24,6 +24,10 @@
  * $Id$
  *
  * $Log$
+ * Revision 1.6  2002/04/30 19:00:29  seletz
+ * - BUGFIX: MEMb() macro was using u16 instead of u8.
+ * - corrected the previous checked in fixes
+ *
  * Revision 1.5  2002/04/29 18:13:36  choover
  * fix -Wall warnings
  *
@@ -73,7 +77,7 @@
 #define WEAK_SYM __attribute__ (( weak ))
 
 #define MEM(adr)	(*((u32 *)(adr)))
-#define MEMb(adr)	(*((u16 *)(adr)))
+#define MEMb(adr)	(*((u8 *)(adr)))
 #define SET(reg,bit)	((reg) |= (1<<(bit)))
 #define CLR(reg,bit)	((reg) &= ~(1<<(bit)))
 
@@ -438,7 +442,7 @@
 			case CISTPL_CONFIG:
 				config_base = (*(p+6) << 8) + (*(p+4));
 				pcmcia_slots[slot].config_base = config_base;
-				_DBG( "%s: config_base=%p\n", __FUNCTION__, &config_base );
+				_DBG( "%s: config_base=0x%04x\n", __FUNCTION__, config_base );
 			default:
 				break;
 		}
@@ -497,8 +501,8 @@
 		goto DONE;
 	}
 
-	_DBG( "%s: base=%p\n", __FUNCTION__, &(pcmcia_slots[slot].base));
-	_DBG( "%s: attr_base=%p\n", __FUNCTION__, &(pcmcia_slots[slot].attr_base));
+	_DBG( "%s: base=%p\n", __FUNCTION__, (void *)pcmcia_slots[slot].base);
+	_DBG( "%s: attr_base=%p\n", __FUNCTION__, (void *)pcmcia_slots[slot].attr_base);
 
 	if ( base )	*base = pcmcia_slots[slot].base;
 	if ( attr )	*attr = pcmcia_slots[slot].attr_base;