Changeset 36877 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Apr 28, 2011 7:38:13 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71455

Message:

BIOS: AHCI driver skeleton

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• Makefile.kmk (modified) (2 diffs)
• ahci.c (added)
• rombios.c (modified) (7 diffs)

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -58 +58 @@
                 $(PATH_SUB_CURRENT)/apmbios.S $(if $(VBOX_WITH_SCSI),$(PATH_SUB_CURRENT)/scsi.c) \
                 $(PATH_SUB_CURRENT)/../DevPcBios.h $(PATH_ROOT)/include/VBox/bioslogo.h \
+                $(if $(VBOX_WITH_BIOS_AHCI),$(PATH_SUB_CURRENT)/ahci.c) \
                 $(VBOX_VERSION_STAMP) | $$(dir $$@)
         $(call MSG_TOOL,cpp,PcBiosBin,$<,$@)
@@ -63 +64 @@
                 -I$(PcBiosBin_0_OUTDIR) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) \
                 -DBX_SMP_PROCESSORS=1 -DVBOX -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) \
-                $(if $(VBOX_WITH_SCSI),-DVBOX_WITH_SCSI) \
+                $(if $(VBOX_WITH_SCSI),-DVBOX_WITH_SCSI) $(if $(VBOX_WITH_BIOS_AHCI),-DVBOX_WITH_BIOS_AHCI) \
                 -P -o $@ $<
 

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -778 +778 @@
 #endif
 
+#ifdef VBOX_WITH_BIOS_AHCI
+  typedef struct {
+    Bit16u iobase;
+    } ahci_t;
+#endif
+
   // for access to EBDA area
   //     The EBDA structure should conform to
@@ -805 +811 @@
     scsi_t scsi;
 # endif
+
+#ifdef VBOX_WITH_BIOS_AHCI
+    ahci_t ahci;
+#endif
 
     unsigned char uForceBootDrive;
@@ -928 +938 @@
 static void           outb_cmos();
 static Bit16u         inw();
+#ifdef VBOX_WITH_BIOS_AHCI
+static Bit32u         inl();
+#endif
 static void           outw();
+#ifdef VBOX_WITH_BIOS_AHCI
+static void           outl();
+#endif
 static void           init_rtc();
 static bx_bool        rtc_updating();
@@ -1265 +1281 @@
 #endif
 
+#ifdef VBOX_WITH_BIOS_AHCI
+  Bit32u
+inl(port)
+  Bit16u port;
+{
+ASM_START
+  push bp
+  mov  bp, sp
+
+    push dx
+    mov  dx, 4[bp]
+    in   eax, dx
+    pop  dx
+
+  pop  bp
+ASM_END
+}
+#endif
+
   void
 outb(port, val)
@@ -1303 +1338 @@
     pop  dx
     pop  ax
+
+  pop  bp
+ASM_END
+}
+#endif
+
+#ifdef VBOX_WITH_BIOS_AHCI
+  void
+outl(port, val)
+  Bit16u port;
+  Bit32u  val;
+{
+ASM_START
+  push bp
+  mov  bp, sp
+
+    push eax
+    push dx
+    mov  dx, _outl.port + 2[bp]
+    mov  eax, _outl.val + 2[bp]
+    out  dx, eax
+    pop  dx
+    pop  eax
 
   pop  bp
@@ -3816 +3874 @@
 #ifdef VBOX_WITH_SCSI
 #  include "scsi.c"
+#endif
+
+#ifdef VBOX_WITH_BIOS_AHCI
+#  include "ahci.c"
 #endif
 
@@ -11660 +11722 @@
 #endif
 
+#ifdef VBOX_WITH_BIOS_AHCI
+  ;;
+  ;; AHCI driver setup
+  ;;
+  call _ahci_init
+  ;;
+#endif
+
   call _print_bios_banner