Changeset 154 for trunk/src/os2ahci/os2ahci.c

Timestamp:

Apr 10, 2013, 6:47:05 PM (12 years ago)

Author:

David Azarewicz

Message:

Begin adding user info output.
Added LVM support.

File:

• trunk/src/os2ahci/os2ahci.c (modified) (9 diffs)

trunk/src/os2ahci/os2ahci.c

@@ -90 +90 @@
 int             verbosity = 1;     /* == 1 -> show sign on banner
                                     *  > 1 -> show adapter info during boot */
+int             use_lvm_info = 1;
 
 PFN             Device_Help = 0;   /* pointer to device helper entry point */
@@ -343 +344 @@
         break;
 
+      case 'z':
+        use_lvm_info = !invert_option;
+        break;
+
       case 'v':
         /* be verbose during boot */
@@ -377 +382 @@
   if (TRACE_ACTIVE) {
     /* debug is on, but COM port is off -> use our trace buffer */
-    trace_init();
-  }
-  dprintf("BldLevel: %s\n", BldLevel);
-  dprintf("CmdLine: %Fs\n", cmd_line);
+    trace_init(AHCI_TRACE_BUF_SIZE);
+  } else {
+    trace_init(AHCI_INFO_BUF_SIZE);
+  }
+
+  printf_nts("BldLevel: %s\n", BldLevel);
+  printf_nts("CmdLine: %Fs\n", cmd_line);
 
   /* scan PCI bus for supported devices */
@@ -390 +398 @@
     mdelay_cal();
 
-    if (DevHelp_RegisterDeviceClass(drv_name, (PFN) add_entry, 0, 1,
-                                    &add_handle)) {
+    if (DevHelp_RegisterDeviceClass(drv_name, (PFN) add_entry, 0, 1, &add_handle)) {
       cprintf("%s: couldn't register device class\n", drv_name);
       goto init_fail;
@@ -466 +473 @@
     case OS2AHCI_IDC_BIOSMODE:
       /* reconfigure adapters in BIOS/int13 mode; needed for generating
-       * trap dumps on some machines. This is called by ACPI.PSD.
+       * trap dumps on some machines. This was intended to be called by ACPI.PSD,
+       * but that is never done. This is obslete. The kernel exit accomplishes
+       * this instead.
        *
        * To enter BIOS mode, we flush all write caches, turn off interrupts
@@ -500 +509 @@
 USHORT char_dev_input(RP_RWV _far *rwrb)
 {
-  if (TRACE_ACTIVE) {
-    return(trace_char_dev(rwrb));
-  }
-  return(STDON | STATUS_ERR_UNKCMD);
+  return(trace_char_dev(rwrb));
 }
 
@@ -804 +810 @@
       init_complete = 1;
 
-      /* DAZ turn off COM port output */
+      /* DAZ turn off COM port output if on */
       com_base = 0;
 
@@ -814 +820 @@
       /* register APM hook */
       apm_init();
+
+      if (!TRACE_ACTIVE) build_user_info();
     }
     iorb_done(iorb);
@@ -1571 +1579 @@
   dprintf("Registered kernel exit routine for INT13 mode\n");
 }
+