X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fsimple_pic.c;h=828b588734f453b414bf09f52426e0e690089fa0;hb=4bc3ee757b44d3e466fd89e348106c47fa5511ee;hp=70031116b6cdbf55b418d0fc6b2a76712f2b27c6;hpb=7cdedeb7a01b51c5242cce94924f2ea246008e7d;p=palacios.git diff --git a/palacios/src/devices/simple_pic.c b/palacios/src/devices/simple_pic.c index 7003111..828b588 100644 --- a/palacios/src/devices/simple_pic.c +++ b/palacios/src/devices/simple_pic.c @@ -23,54 +23,54 @@ #include struct pic_internal { - int pending_irq; + int pending_irq; }; static int pic_intr_pending(void * private_data) { - struct pic_internal * data = (struct pic_internal *)private_data; + struct pic_internal * data = (struct pic_internal *)private_data; - return (data->pending_irq > 0); + return (data->pending_irq > 0); } static int pic_raise_intr(void * private_data, int irq) { - struct pic_internal * data = (struct pic_internal *)private_data; + struct pic_internal * data = (struct pic_internal *)private_data; - data->pending_irq = irq; + data->pending_irq = irq; - return 0; + return 0; } static int pic_get_intr_number(void * private_data) { - struct pic_internal * data = (struct pic_internal *)private_data; + struct pic_internal * data = (struct pic_internal *)private_data; - return data->pending_irq; + return data->pending_irq; } static struct intr_ctrl_ops intr_ops = { - .intr_pending = pic_intr_pending, - .get_intr_number = pic_get_intr_number, - .raise_intr = pic_raise_intr + .intr_pending = pic_intr_pending, + .get_intr_number = pic_get_intr_number, + .raise_intr = pic_raise_intr }; static int pic_init_device(struct vm_device * dev) { - struct pic_internal * data = (struct pic_internal *)dev->private_data; - v3_set_intr_controller(dev->vm, &intr_ops, data); - data->pending_irq = 0; + struct pic_internal * data = (struct pic_internal *)dev->private_data; + v3_register_intr_controller(dev->vm, &intr_ops, data); + data->pending_irq = 0; - return 0; + return 0; } static int pic_deinit_device(struct vm_device * dev) { - return 0; + return 0; } @@ -78,21 +78,21 @@ static int pic_deinit_device(struct vm_device * dev) { static struct vm_device_ops dev_ops = { - .init = pic_init_device, - .deinit = pic_deinit_device, - .reset = NULL, - .start = NULL, - .stop = NULL + .init = pic_init_device, + .deinit = pic_deinit_device, + .reset = NULL, + .start = NULL, + .stop = NULL }; struct vm_device * v3_create_simple_pic() { - struct pic_internal * state = NULL; - state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal)); - V3_ASSERT(state != NULL); + struct pic_internal * state = NULL; + state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal)); + V3_ASSERT(state != NULL); - struct vm_device * pic_dev = v3_create_device("Simple Pic", &dev_ops, state); + struct vm_device * pic_dev = v3_create_device("Simple Pic", &dev_ops, state); - return pic_dev; + return pic_dev; }