Be sure to add "void" to all function prototypes that take no args.

[seabios.git] / src / pcibios.c

diff --git a/src/pcibios.c b/src/pcibios.c
index cfcb25e979cdbe057e836c01f3842d79642d2585..2e44c015d4b72d2eeb87ffa047d3fcadf1dc5451 100644 (file)
--- a/src/pcibios.c
+++ b/src/pcibios.c
@@ -12,6 +12,10 @@
 #include "biosvar.h" // GET_EBDA
 #include "pci_regs.h" // PCI_VENDOR_ID
 
+// romlayout.S
+extern void bios32_entry(void);
+extern void pcibios32_entry(void);
+
 #define RET_FUNC_NOT_SUPPORTED 0x81
 #define RET_BAD_VENDOR_ID      0x83
 #define RET_DEVICE_NOT_FOUND   0x86
@@ -30,8 +34,7 @@ handle_1ab101(struct bregs *regs)
     regs->bx = 0x0210; // PCI version 2.10
     regs->cl = pci_bdf_to_bus(max - 1);
     regs->edx = 0x20494350; // "PCI "
-    // XXX - bochs bios code sets edi to point to 32bit code - but no
-    // reference to this in spec.
+    regs->edi = (u32)pcibios32_entry + BUILD_BIOS_ADDR;
     set_code_success(regs);
 }
 
@@ -52,7 +55,7 @@ handle_1ab102(struct bregs *regs)
         set_code_success(regs);
         return;
     }
-    set_code_fail(regs, RET_DEVICE_NOT_FOUND);
+    set_code_invalid(regs, RET_DEVICE_NOT_FOUND);
 }
 
 // find class code
@@ -72,7 +75,7 @@ handle_1ab103(struct bregs *regs)
         set_code_success(regs);
         return;
     }
-    set_code_fail(regs, RET_DEVICE_NOT_FOUND);
+    set_code_invalid(regs, RET_DEVICE_NOT_FOUND);
 }
 
 // read configuration byte
@@ -129,27 +132,33 @@ handle_1ab10e(struct bregs *regs)
 {
     struct pir_header *pirtable_g = (void*)(GET_GLOBAL(PirOffset) + 0);
     if (! pirtable_g) {
-        set_code_fail(regs, RET_FUNC_NOT_SUPPORTED);
+        set_code_invalid(regs, RET_FUNC_NOT_SUPPORTED);
         return;
     }
 
+    struct param_s {
+        u16 size;
+        u16 buf_off;
+        u16 buf_seg;
+    } *param_far = (void*)(regs->di+0);
+
     // Validate and update size.
-    u16 size = GET_FARVAR(regs->es, *(u16*)(regs->di+0));
-    u16 pirsize = (GET_GLOBAL(pirtable_g->size)
-                   - sizeof(struct pir_header));
-    SET_FARVAR(regs->es, *(u16*)(regs->di+0), pirsize);
-    if (size < pirsize) {
-        set_code_fail(regs, RET_BUFFER_TOO_SMALL);
+    u16 bufsize = GET_FARVAR(regs->es, param_far->size);
+    u16 pirsize = GET_GLOBAL(pirtable_g->size) - sizeof(struct pir_header);
+    SET_FARVAR(regs->es, param_far->size, pirsize);
+    if (bufsize < pirsize) {
+        set_code_invalid(regs, RET_BUFFER_TOO_SMALL);
         return;
     }
 
     // Get dest buffer.
-    void *d_far = (void*)(GET_FARVAR(regs->es, *(u16*)(regs->di+2)) + 0);
-    u16 d_seg = GET_FARVAR(regs->es, *(u16*)(regs->di+4));
+    void *buf_far = (void*)(GET_FARVAR(regs->es, param_far->buf_off)+0);
+    u16 buf_seg = GET_FARVAR(regs->es, param_far->buf_seg);
 
     // Memcpy pir table slots to dest buffer.
-    memcpy_far(d_seg, d_far
-               , get_global_seg(), pirtable_g->slots
+    memcpy_far(buf_seg, buf_far
+               , get_global_seg()
+               , (void*)(pirtable_g->slots) + get_global_offset()
                , pirsize);
 
     // XXX - bochs bios sets bx to (1 << 9) | (1 << 11)
@@ -160,7 +169,7 @@ handle_1ab10e(struct bregs *regs)
 static void
 handle_1ab1XX(struct bregs *regs)
 {
-    set_code_fail(regs, RET_FUNC_NOT_SUPPORTED);
+    set_code_unimplemented(regs, RET_FUNC_NOT_SUPPORTED);
 }
 
 void
@@ -169,7 +178,7 @@ handle_1ab1(struct bregs *regs)
     //debug_stub(regs);
 
     if (! CONFIG_PCIBIOS) {
-        set_fail(regs);
+        set_invalid(regs);
         return;
     }
 
@@ -187,3 +196,41 @@ handle_1ab1(struct bregs *regs)
     default:   handle_1ab1XX(regs); break;
     }
 }
+
+
+/****************************************************************
+ * 32bit interface
+ ****************************************************************/
+
+#if MODE16 == 0 && MODESEGMENT == 1
+// Entry point for 32bit pci bios functions.
+void VISIBLE32SEG
+handle_pcibios32(struct bregs *regs)
+{
+    debug_enter(regs, DEBUG_HDL_pcibios32);
+    handle_1ab1(regs);
+}
+#endif
+
+struct bios32_s {
+    u32 signature;
+    u32 entry;
+    u8 version;
+    u8 length;
+    u8 checksum;
+    u8 reserved[5];
+} PACKED;
+
+struct bios32_s BIOS32HEADER __aligned(16) VAR16EXPORT = {
+    .signature = 0x5f32335f, // _32_
+    .length = sizeof(BIOS32HEADER) / 16,
+};
+
+void
+bios32_setup(void)
+{
+    dprintf(3, "init bios32\n");
+
+    BIOS32HEADER.entry = (u32)bios32_entry;
+    BIOS32HEADER.checksum -= checksum(&BIOS32HEADER, sizeof(BIOS32HEADER));
+}