X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fsimple_pic.c;h=bbc58f3ccc781b89b23320dec142fd047f4190c0;hb=4f7c3b759e3889870c5b5e7d09b3ffcc168e5632;hp=55eea77fdfda4848bdacd22dddc063b52e72e366;hpb=2b1f4ef19d766727f873476861c64339c8836a40;p=palacios.git diff --git a/palacios/src/devices/simple_pic.c b/palacios/src/devices/simple_pic.c index 55eea77..bbc58f3 100644 --- a/palacios/src/devices/simple_pic.c +++ b/palacios/src/devices/simple_pic.c @@ -1,3 +1,6 @@ +/* Northwestern University */ +/* (c) 2008, Jack Lange */ + #include #include #include @@ -5,7 +8,7 @@ struct pic_internal { int pending_irq; - int error_code; + }; @@ -15,11 +18,11 @@ static int pic_intr_pending(void * private_data) { return (data->pending_irq > 0); } -static int pic_raise_intr(void * private_data, int irq, int error_code) { +static int pic_raise_intr(void * private_data, int irq) { struct pic_internal * data = (struct pic_internal *)private_data; data->pending_irq = irq; - data->error_code = error_code; + return 0; } @@ -69,7 +72,8 @@ static struct vm_device_ops dev_ops = { struct vm_device * create_simple_pic() { struct pic_internal * state = NULL; - V3_Malloc(struct pic_internal *, state, sizeof(struct pic_internal)); + state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal)); + V3_ASSERT(state != NULL); struct vm_device * pic_dev = create_device("Simple Pic", &dev_ops, state);