X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fi440fx.c;h=2408cdd87b235256a0a32b2287fd7c43abbacf2f;hp=9d712df7230c2236774b4ebf61f4f08d5b5eae31;hb=afb2a35b2e15ba0fa932c4e49a3678f958a4502a;hpb=1f3ac121a2cb2eff7c71c84a799096c2cd744d1b

diff --git a/palacios/src/devices/i440fx.c b/palacios/src/devices/i440fx.c
index 9d712df..2408cdd 100644
--- a/palacios/src/devices/i440fx.c
+++ b/palacios/src/devices/i440fx.c
@@ -18,10 +18,14 @@
  */
 
 #include <palacios/vmm.h>
-#include <devices/i440fx.h>
+#include <palacios/vmm_dev_mgr.h>
+#include <devices/pci.h>
+
+
+// We Have to setup some sort of PIC interrupt mapping here....
 
 struct i440_state {
-    int foo;
+    struct vm_device * pci;
 };
 
 
@@ -36,37 +40,15 @@ static int io_write(ushort_t port, void * src, uint_t length, struct vm_device *
 }
 
 
-static int i440_init(struct vm_device * dev) {
-    // struct i440_state * state = (struct i440_state *)(dev->private_data);
-
-   
-    v3_dev_hook_io(dev, 0x00b2, 
-		   &io_read, &io_write);
-    v3_dev_hook_io(dev, 0x00b3, 
-		   &io_read, &io_write);
-
-
-    v3_dev_hook_io(dev, 0x0cf8, 
-		   &io_read, &io_write);
-
 
 
-    v3_dev_hook_io(dev, 0x0cf9, 
-		   &io_read, &io_write);
-
-
-
-    return 0;
-}
-
 
-static int i440_deinit(struct vm_device * dev) {
+static int i440_free(struct vm_device * dev) {
     return 0;
 }
 
-static struct vm_device_ops dev_ops = {
-    .init = i440_init, 
-    .deinit = i440_deinit,
+static struct v3_device_ops dev_ops = {
+    .free = i440_free,
     .reset = NULL,
     .start = NULL,
     .stop = NULL,
@@ -74,15 +56,59 @@ static struct vm_device_ops dev_ops = {
 
 
 
-struct vm_device * v3_create_i440fx(struct vm_device * pci) {
 
+static int i440_init(struct guest_info * vm, void * cfg_data) {
+    struct pci_device * pci_dev = NULL;
+    struct v3_pci_bar bars[6];
+    int i;
     struct i440_state * state = NULL;
+    struct vm_device * pci = v3_find_dev(vm, (char *)cfg_data);
 
+    if (!pci) {
+	PrintError("could not find PCI Device\n");
+	return -1;
+    }
 
     state = (struct i440_state *)V3_Malloc(sizeof(struct i440_state));
+
+    state->pci = pci;
 	
-    struct vm_device * i440_dev = v3_create_device("i440FX", &dev_ops, state);
+    struct vm_device * dev = v3_allocate_device("i440FX", &dev_ops, state);
+
+    if (v3_attach_device(vm, dev) == -1) {
+	PrintError("Could not attach device %s\n", "i440FX");
+	return -1;
+    }
+
+
+    for (i = 0; i < 4; i++) {
+	v3_dev_hook_io(dev, 0x0cf8 + i,
+		       &io_read, &io_write);
+	v3_dev_hook_io(dev, 0x0cfc + i,
+		       &io_read, &io_write);
+    }
+
+    for (i = 0; i < 6; i++) {
+	bars[i].type = PCI_BAR_NONE;
+    }    
 
-    return i440_dev;
+    pci_dev = v3_pci_register_device(state->pci, PCI_STD_DEVICE, 
+				     0, 0, 0, "i440FX", bars,
+				     NULL, NULL, NULL, dev);
 
+    if (!pci_dev) {
+ 	return -1;
+    }
+
+    pci_dev->config_header.vendor_id = 0x8086;
+    pci_dev->config_header.device_id = 0x1237;
+    pci_dev->config_header.revision = 0x02;
+    pci_dev->config_header.subclass = 0x00; //  SubClass: host2pci
+    pci_dev->config_header.class = PCI_CLASS_BRIDGE;    // Class: PCI bridge
+
+    pci_dev->config_space[0x72] = 0x02; // SMRAM (?)
+
+    return 0;
 }
+
+device_register("i440FX", i440_init)