Update of /cvsroot/blob/blob/src/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21025
Modified Files:
pcmcia.c
Log Message:
cosmetics
Index: pcmcia.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/pcmcia.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pcmcia.c 9 Feb 2004 19:25:12 -0000 1.9
+++ pcmcia.c 17 Feb 2004 10:40:16 -0000 1.10
@@ -49,7 +49,7 @@
#define PCMCIA_DEBUG 1
#ifdef PCMCIA_DEBUG
-# define _DBG( x, fmt, args... ) do { if ( dbg>=x ) printf( "%s:" fmt "\n", __FUNCTION__, ## args ); }while(0)
+# define _DBG( x, fmt, args... ) do { if ( dbg>=x ) printf( "%s: " fmt "\n", __FUNCTION__, ## args ); }while(0)
# define _DBGERR( x, code ) do { if ( dbg>=x ) printf( "%s(%d): ERROR %d.\n", __FUNCTION__, __LINE__, code ); ret = code; goto DONE; } while(0)
#else
# define _DBG( x, fmt, args... ) do { } while(0)
@@ -134,8 +134,8 @@
printf((iface == CISTPL_IDE_INTERFACE) ? " IDE" : " unknown");
printf(" interface ");
- break;
- }
+ break;
+ }
case CISTPL_FUNCE_IDE_MASTER:
case CISTPL_FUNCE_IDE_SLAVE:
{ u8 f1 = *(p+2);
@@ -361,7 +361,7 @@
ret = pcmcia_sock_enable( sock );
if ( ret ) continue;
_DBG( 1, "enabled socket %d", nr );
-
+
/* reset */
ret = pcmcia_sock_reset( sock );
if ( ret ) _DBGERR( dbg, ret );
@@ -376,7 +376,8 @@
ret = detected;
DONE:
return ret;
- }
+}
+__initlist(pcmcia_init, INIT_LEVEL_OTHER_STUFF);
/*********************************************************************
* pcmcia_sock_dump_status - dump socket status
@@ -392,7 +393,7 @@
ret = pcmcia_sock_get( nr, &sock );
if ( ret ) _DBGERR( dbg, ret );
-
+
ret = pcmcia_driver->sock_status_dump( sock );
DONE:
return ret;
@@ -415,7 +416,7 @@
}
DONE:
return ret;
- }
+}
/*********************************************************************
* pcmcia_sock_detect - detect socket
@@ -463,7 +464,7 @@
sock->state |= PCMCIA_SS_ENABLED;
DONE:
return ret;
- }
+}
/*********************************************************************
* pcmcia_sock_disable - disable socket
@@ -517,13 +518,12 @@
*value = MEMb( pcmcia_driver->sock[sock].attr_base + offset );
- _DBG( 1, "%s: ATTR_REG(0x%02x) => 0x%02x\n", __FUNCTION__,
- offset, *value );
+ _DBG( 1, "ATTR_REG(0x%02x) => 0x%02x", offset, *value );
ret = 0;
DONE:
return ret;
- }
+}
int pcmcia_sock_attr_write( int sock, u16 offset, u8 value )
{
@@ -531,8 +531,7 @@
if ( !PCMCIA_SOCK_NR_VALID( sock ) ) _DBGERR( dbg, -EINVAL );
- _DBG( 1, "%s: ATTR_REG(0x%02x) <= 0x%02x\n", __FUNCTION__,
- offset, value );
+ _DBG( 1, "ATTR_REG(0x%02x) <= 0x%02x", offset, value );
MEMb( pcmcia_driver->sock[sock].attr_base + offset) = value;
@@ -552,8 +551,7 @@
*value = MEMb( pcmcia_driver->sock[sock].io_base + offset);
- _DBG( 1, "%s: IO_REG(0x%02x) => 0x%02x\n", __FUNCTION__,
- offset, *value );
+ _DBG( 1, "IO_REG(0x%02x) => 0x%02x\n", offset, *value );
ret = 0;
DONE:
@@ -566,14 +564,13 @@
if ( !PCMCIA_SOCK_NR_VALID( sock ) ) _DBGERR( dbg, -EINVAL );
- _DBG( 1, "%s: IO_REG(0x%02x) <= 0x%02x\n", __FUNCTION__,
- offset, value );
+ _DBG( 1, "IO_REG(0x%02x) <= 0x%02x\n", offset, value );
MEMb( pcmcia_driver->sock[sock].io_base + value );
ret = 0;
DONE:
return ret;
- }
+}
/******************************************************************************
* MEMORY SPACE ACCESS
@@ -586,8 +583,7 @@
*value = MEMb( pcmcia_driver->sock[sock].mem_base + offset);
- _DBG( 1, "%s: MEM_REG(0x%02x) => 0x%02x\n", __FUNCTION__,
- offset, *value );
+ _DBG( 1, "MEM_REG(0x%02x) => 0x%02x", offset, *value );
ret = 0;
DONE:
@@ -600,8 +596,7 @@
if ( !PCMCIA_SOCK_NR_VALID( sock ) ) _DBGERR( dbg, -EINVAL );
- _DBG( 1, "%s: MEM_REG(0x%02x) <= 0x%02x\n", __FUNCTION__,
- offset, value );
+ _DBG( 1, "MEM_REG(0x%02x) <= 0x%02x", offset, value );
MEMb( pcmcia_driver->sock[sock].mem_base + value );
ret = 0;
@@ -651,11 +646,11 @@
printf( "Socket %d: IO [ 0x%08X ], ATTR [ 0x%08X ], MEM [ 0x%08X ]\n",
nr, sock->io_base, sock->attr_base, sock->mem_base );
-}
+ }
ret = pcmcia_init();
printf( "detected %d cards.\n", ret );
-
+
ret = 0;
DONE:
return ret;
|
