Changeset 17886 for src/router/nvram/nvram_linux.c

Timestamp:

11/12/11 15:49:22 (18 months ago)

Author:

BrainSlayer

Message:

block only get functions until nvram is available

File:

• src/router/nvram/nvram_linux.c (modified) (6 diffs)

src/router/nvram/nvram_linux.c

@@ -39 +39 @@
 #ifdef HAVE_X86
         FILE *in = fopen("/usr/local/nvram/nvram.bin", "rb");
-        if (in==NULL)
-            return -1;
+        if (in == NULL)
+                return -1;
         fclose(in);
 #endif
@@ -91 +91 @@
         unsigned long *off = (unsigned long *)tmp;
 
-        if (nvram_fd < 0)
+        if (nvram_fd < 0) {
+#ifdef HAVE_X86
+                FILE *in = fopen("/usr/local/nvram/nvram.bin", "rb");
+                if (in == NULL)
+                        return NULL;
+                fclose(in);
+#endif
                 if (nvram_init(NULL)) {
                         //unlock();
                         return NULL;
                 }
+        }
         if (count > sizeof(tmp)) {
                 if (!(off = malloc(count))) {
@@ -112 +119 @@
         else
                 value = NULL;
-        
+
 #ifndef HAVE_MICRO
         if (value)
-            msync(nvram_buf, NVRAM_SPACE, MS_INVALIDATE);
+                msync(nvram_buf, NVRAM_SPACE, MS_INVALIDATE);
 #endif
         if (count < 0)
@@ -124 +131 @@
         //unlock();
 
-
         return value;
 }
@@ -133 +139 @@
         int ret;
 
-        if (nvram_fd < 0)
+        if (nvram_fd < 0) {
+#ifdef HAVE_X86
+                FILE *in = fopen("/usr/local/nvram/nvram.bin", "rb");
+                if (in == NULL)
+                        return 0;
+                fclose(in);
+#endif
                 if ((ret = nvram_init(NULL))) {
                         //unlock();
                         return ret;
                 }
+        }
         if (count == 0) {
                 //unlock();
@@ -244 +257 @@
                 exit(1);
         }
-#if defined(HAVE_WZRHPG300NH) || defined(HAVE_WHRHPGN) || defined(HAVE_WZRHPAG300NH) || defined(HAVE_DIR825) || defined(HAVE_TEW632BRP) || defined(HAVE_TG2521) || defined(HAVE_WR1043)  || defined(HAVE_WRT400) || defined(HAVE_WZRHPAG300NH) || defined(HAVE_WZRG450) || defined(HAVE_DANUBE) 
-        system("/sbin/ledtool 1"); 
+#if defined(HAVE_WZRHPG300NH) || defined(HAVE_WHRHPGN) || defined(HAVE_WZRHPAG300NH) || defined(HAVE_DIR825) || defined(HAVE_TEW632BRP) || defined(HAVE_TG2521) || defined(HAVE_WR1043)  || defined(HAVE_WRT400) || defined(HAVE_WZRHPAG300NH) || defined(HAVE_WZRG450) || defined(HAVE_DANUBE)
+        system("/sbin/ledtool 1");
 #elif HAVE_LSX
         //nothing