[OpenBIOS] r262 - in openbios-devel: arch/sparc32 arch/sparc64 include/openbios modules
svn at openbios.org
svn at openbios.org
Tue Nov 25 19:30:22 CET 2008
Author: blueswirl
Date: 2008-11-25 19:30:22 +0100 (Tue, 25 Nov 2008)
New Revision: 262
Modified:
openbios-devel/arch/sparc32/openbios.c
openbios-devel/arch/sparc64/openbios.c
openbios-devel/include/openbios/nvram.h
openbios-devel/modules/nvram.c
Log:
Rearrange nvram init
Modified: openbios-devel/arch/sparc32/openbios.c
===================================================================
--- openbios-devel/arch/sparc32/openbios.c 2008-11-24 19:29:24 UTC (rev 261)
+++ openbios-devel/arch/sparc32/openbios.c 2008-11-25 18:30:22 UTC (rev 262)
@@ -118,7 +118,7 @@
ob_obio_init(hwdef->slavio_base, hwdef->fd_offset,
hwdef->counter_offset, hwdef->intr_offset,
hwdef->aux1_offset, hwdef->aux2_offset);
- nvram_init();
+ nvconf_init();
#endif
#ifdef CONFIG_DRIVER_SBUS
#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c 2008-11-24 19:29:24 UTC (rev 261)
+++ openbios-devel/arch/sparc64/openbios.c 2008-11-25 18:30:22 UTC (rev 262)
@@ -833,7 +833,7 @@
init_video();
#endif
- nvram_init();
+ nvconf_init();
ob_su_init(0x1fe02000000ULL, 0x3f8ULL, 0);
device_end();
Modified: openbios-devel/include/openbios/nvram.h
===================================================================
--- openbios-devel/include/openbios/nvram.h 2008-11-24 19:29:24 UTC (rev 261)
+++ openbios-devel/include/openbios/nvram.h 2008-11-25 18:30:22 UTC (rev 262)
@@ -21,7 +21,8 @@
extern void arch_nvram_get( char *buf );
extern void arch_nvram_put( char *buf );
-extern void nvram_init( void );
+extern void nvconf_init( void );
+extern void nvram_init( char *path );
extern void update_nvram( void );
#endif /* _H_NVRAM */
Modified: openbios-devel/modules/nvram.c
===================================================================
--- openbios-devel/modules/nvram.c 2008-11-24 19:29:24 UTC (rev 261)
+++ openbios-devel/modules/nvram.c 2008-11-25 18:30:22 UTC (rev 262)
@@ -163,7 +163,7 @@
arch_nvram_put( nvram.data );
}
-static void
+void
nvconf_init( void )
{
int once=0;
@@ -219,7 +219,7 @@
uint mark_lo;
} nvram_ibuf_t;
-DECLARE_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t), "Tnvram" );
+DECLARE_UNNAMED_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t ));
/* ( pos_lo pos_hi -- status ) */
static void
@@ -289,9 +289,9 @@
void
-nvram_init( void )
+nvram_init( char *path )
{
nvconf_init();
- REGISTER_NODE( nvram );
+ REGISTER_NAMED_NODE( nvram, path );
}
More information about the OpenBIOS
mailing list