Changeset 223 for trunk

Timestamp:

Mar 3, 2009, 10:01:17 PM (16 years ago)

Author:

katerina

Message:

Allow to switch off check of PCI expansion ROMs (ticket #149).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• include/sh_kern.h (modified) (1 diff)
• src/sh_kern.c (modified) (6 diffs)
• test/testhash.sh (modified) (1 diff)

trunk/docs/Changelog

@@ -1 @@
-2.5.3:
+2.5.4:
+        * option KernelCheckPCI to switch off check of PCI expansion ROMs
+        
+2.5.3 (25-02-2009):
         * disable dnmalloc on MacOS X, doesn't work properly
         * stat -> lstat in sh_unix_file_exists (OS X nameforks, report

trunk/include/sh_kern.h

@@ -16 +16 @@
 int sh_kern_set_timer    (const char * c);
 int sh_kern_set_idt      (const char * c);
+int sh_kern_set_pci      (const char * c);
 int sh_kern_set_sct_addr (const char * c);
 int sh_kern_set_sc_addr  (const char * c);

trunk/src/sh_kern.c

@@ -86 +86 @@
     N_("kernelcheckidt"),
     sh_kern_set_idt
+  },
+  {
+    N_("kernelcheckpci"),
+    sh_kern_set_pci
   },
   {
@@ -120 +124 @@
 static int     ShKernDelay    = 100; /* milliseconds */
 static int     ShKernIDT      = S_TRUE;
+static int     ShKernPCI      = S_TRUE;
 
 /* The address of system_call
@@ -979 +984 @@
        */
       fd = open ( pcipath, O_RDWR );
-      do {
-        status = write( fd, "1", 1 );
-      } while (status < 0 && errno == EINTR);
-      close ( fd );
-
-      check_rom(pcipath, name);
-
-      fd = open ( pcipath, O_RDWR );
-      do {
-        status = write( fd, "0", 1 );
-      } while (status < 0 && errno == EINTR);
-      close ( fd );
+      if (fd)
+        {
+          do {
+            status = write( fd, "1", 1 );
+          } while (status < 0 && errno == EINTR);
+          close ( fd );
+
+          if (status > 0)
+            {
+              check_rom(pcipath, name);
+              
+              fd = open ( pcipath, O_RDWR );
+              if (fd)
+                {
+                  do {
+                    status = write( fd, "0", 1 );
+                  } while (status < 0 && errno == EINTR);
+                  close ( fd );
+                }
+            }
+        }
     }
   return;
@@ -1001 +1015 @@
   DIR * df;
   struct dirent * entry;
+
+  if (ShKernPCI != S_TRUE)
+    return;
 
   sl_strlcpy(pci_dir, SYS_BUS_PCI, sizeof(pci_dir));
@@ -1028 +1045 @@
       closedir(df);
     }
+  return;
 }
 
@@ -1930 +1948 @@
 }
 
+int sh_kern_set_pci (const char * c)
+{
+  int i;
+  SL_ENTER(_("sh_kern_set_pci"));
+  i = sh_util_flagval(c, &ShKernPCI);
+  SL_RETURN(i, _("sh_kern_set_pci"));
+}
+
 int sh_kern_set_sc_addr (const char * c)
 {

trunk/test/testhash.sh

@@ -37 +37 @@
         fi
         #
-        ${TOP_SRCDIR}/configure --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-debug
+        ${TOP_SRCDIR}/configure --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-debug 
         #
         fail=0