Changeset 42770 in vbox for trunk/src

Timestamp:

Aug 11, 2012 5:03:21 PM (12 years ago)

Author:

vboxsync

Message:

BIOS: Added a very minimal APM implementation.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• Makefile.kmk (modified) (2 diffs)
• apm.c (added)
• apm_pm.asm (added)
• makefile (modified) (1 diff)
• notes.txt (modified) (2 diffs)
• orgs.asm (modified) (4 diffs)

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

@@ -58 +58 @@
         scsi.c \
         ahci.c \
+        apm.c \
         pcibios.c \
         pciutil.c \
@@ -63 +64 @@
         ../../BiosCommonCode/support.asm \
         pcibio32.asm \
+        apm_pm.asm \
         $(VBoxPcBios32_1_TARGET) \
         orgs.asm

trunk/src/VBox/Devices/PC/BIOS/makefile

@@ -31 +31 @@
 
 OBJS =  bios.obj print.obj ata.obj floppy.obj eltorito.obj boot.obj &
-        keyboard.obj disk.obj serial.obj system.obj timepci.obj &
-        ps2mouse.obj parallel.obj logo.obj scsi.obj ahci.obj &
+        keyboard.obj disk.obj serial.obj system.obj timepci.obj logo.obj &
+        ps2mouse.obj parallel.obj scsi.obj ahci.obj apm.obj apm_pm.obj &
         pcibios.obj pciutil.obj vds.obj pcibio32.obj pci32.obj orgs.obj
 

trunk/src/VBox/Devices/PC/BIOS/notes.txt

@@ -46 +46 @@
 - PC DOS 6.x/7.x QCONFIG is a rare user of INT 16h fn 0Ah (read keyboard ID).
 
+- Windows 98 is one of the few APM 1.2 users; Windows 95 uses APM 1.1, while
+  newer systems prefer ACPI.
+
 
  Notes on BIOS implementation
@@ -72 +75 @@
   the type unsigned.
 
+- The PCI BIOS services are implemented in C, compiled twice as 16-bit and
+  32-bit code. This reduces the development effort and significantly lowers
+  the risk of discrepancies between 16-bit and 32-bit implementation. Care
+  must be taken because the 16-bit implementation can be executed in both
+  real and protected mode.
+
+- APM can be in theory implemented only once for real, 16-bit protected and
+  32-bit protected mode. Unfortunately this is very inconvenient in C since
+  the default stack size changes between 16-bit and 32-bit callers. Therefore
+  real mode APM (which supports most functions) is implemented in C and
+  protected-mode APM is written in assembler for both 16-bit and 32-bit calls,
+  with a small 32->16 thunk.
 
 

trunk/src/VBox/Devices/PC/BIOS/orgs.asm

@@ -112 +112 @@
 extrn           _int70_function:near
 extrn           _int74_function:near
+extrn           _apm_function:near
 extrn           _ata_init:near
 extrn           _ahci_init:near
@@ -1519 +1520 @@
 int15_handler:
                 pushf
-                cmp     ah, 53h         ; APM function?
-                je      apm_call
                 push    ds
                 push    es
@@ -1529 +1528 @@
                 je      int15_handler32
                 pusha
-                cmp     ah, 0C2h
+                cmp     ah, 53h         ; APM function?
+                je      apm_call
+                cmp     ah, 0C2h        ; PS/2 mouse function?
                 je      int15_handler_mouse
 
                 call    _int15_function
-int15_handler_mouse_ret:
+int15_handler_popa_ret:
                 popa
 int15_handler32_ret:
@@ -1542 +1543 @@
 
 apm_call:
-; TODO!!
-                popf
-                stc
-                jmp     iret_modify_cf
-;               jmp     apmreal_entry
+                call    _apm_function
+                jmp     int15_handler_popa_ret
 
 int15_handler_mouse:
                 call    _int15_function_mouse
-                jmp     int15_handler_mouse_ret
+                jmp     int15_handler_popa_ret
 
 int15_handler32: