X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fgeneric.c;h=130c7081d66be8184e194201af201eedfcae23d3;hb=074523a44f8e4e91f0945633b36cd39cc1d959f9;hp=dc018ab5c32e67bdbfcf894816d5695580faaecb;hpb=7617d3cee4bd93b90558206b1bb1681c07f0396a;p=palacios.git diff --git a/palacios/src/devices/generic.c b/palacios/src/devices/generic.c index dc018ab..130c708 100644 --- a/palacios/src/devices/generic.c +++ b/palacios/src/devices/generic.c @@ -1,8 +1,23 @@ -/* (c) 2008, Peter Dinda */ -/* (c) 2008, The V3VEE Project */ - - - +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Peter Dinda + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Peter Dinda + * Contributor: 2008, Jack Lange + * + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ #include #include @@ -55,27 +70,22 @@ struct irq_range { -int generic_reset_device(struct vm_device * dev) -{ +static int generic_reset_device(struct vm_device * dev) { PrintDebug("generic: reset device\n"); - return 0; - } -int generic_start_device(struct vm_device * dev) -{ +static int generic_start_device(struct vm_device * dev) { PrintDebug("generic: start device\n"); return 0; } -int generic_stop_device(struct vm_device * dev) -{ +static int generic_stop_device(struct vm_device * dev) { PrintDebug("generic: stop device\n"); return 0; } @@ -83,11 +93,10 @@ int generic_stop_device(struct vm_device * dev) -int generic_write_port_passthrough(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int generic_write_port_passthrough(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { uint_t i; PrintDebug("generic: writing 0x"); @@ -101,10 +110,6 @@ int generic_write_port_passthrough(ushort_t port, switch (length) { case 1: -<<<<<<< HEAD:palacios/src/devices/generic.c -======= - ->>>>>>> ramdisk:palacios/src/devices/generic.c v3_outb(port,((uchar_t*)src)[0]); break; case 2: @@ -112,10 +117,6 @@ int generic_write_port_passthrough(ushort_t port, break; case 4: v3_outdw(port,((uint_t*)src)[0]); -<<<<<<< HEAD:palacios/src/devices/generic.c -======= - ->>>>>>> ramdisk:palacios/src/devices/generic.c break; default: for (i = 0; i < length; i++) { @@ -129,11 +130,10 @@ int generic_write_port_passthrough(ushort_t port, return length; } -int generic_read_port_passthrough(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int generic_read_port_passthrough(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { uint_t i; PrintDebug("generic: reading 0x%x bytes from port 0x%x ...", length, port); @@ -166,11 +166,10 @@ int generic_read_port_passthrough(ushort_t port, return length; } -int generic_write_port_ignore(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int generic_write_port_ignore(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { uint_t i; PrintDebug("generic: writing 0x"); @@ -184,11 +183,10 @@ int generic_write_port_ignore(ushort_t port, return length; } -int generic_read_port_ignore(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int generic_read_port_ignore(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { PrintDebug("generic: reading 0x%x bytes from port 0x%x ...", length, port); @@ -200,16 +198,16 @@ int generic_read_port_ignore(ushort_t port, -int generic_interrupt(uint_t irq, struct vm_device * dev) { +static int generic_interrupt(uint_t irq, struct vm_device * dev) { PrintDebug("generic: interrupt 0x%x - injecting into VM\n", irq); - dev->vm->vm_ops.raise_irq(dev->vm, irq); + v3_raise_irq(dev->vm, irq); return 0; } -int generic_init_device(struct vm_device * dev) { +static int generic_init_device(struct vm_device * dev) { struct generic_internal * state = (struct generic_internal *)(dev->private_data); PrintDebug("generic: init_device\n"); @@ -229,13 +227,13 @@ int generic_init_device(struct vm_device * dev) { for (i = tmp->start; i <= tmp->end; i++) { if (tmp->type == GENERIC_PRINT_AND_PASSTHROUGH) { - if (dev_hook_io(dev, i, &generic_read_port_passthrough, &generic_write_port_passthrough)) { + if (v3_dev_hook_io(dev, i, &generic_read_port_passthrough, &generic_write_port_passthrough)) { PrintDebug("generic: can't hook port 0x%x (already hooked?)\n", i); } } else if (tmp->type == GENERIC_PRINT_AND_IGNORE) { - if (dev_hook_io(dev, i, &generic_read_port_ignore, &generic_write_port_ignore)) { + if (v3_dev_hook_io(dev, i, &generic_read_port_ignore, &generic_write_port_ignore)) { PrintDebug("generic: can't hook port 0x%x (already hooked?)\n", i); } } @@ -257,7 +255,7 @@ int generic_init_device(struct vm_device * dev) { tmp->start, tmp->end); - if (dev_hook_mem(dev, tmp->start, tmp->end)) { + if (v3_dev_hook_mem(dev, tmp->start, tmp->end)) { PrintDebug("generic: Can't hook addresses 0x%x to 0x%x (already hooked?)\n", tmp->start, tmp->end); } @@ -279,7 +277,7 @@ int generic_init_device(struct vm_device * dev) { tmp->start, tmp->end); for (i = tmp->start; i <= tmp->end; i++) { - if (dev_hook_irq(dev, i, &generic_interrupt)) { + if (v3_dev_hook_irq(dev, i, &generic_interrupt)) { PrintDebug("generic: can't hook irq 0x%x (already hooked?)\n", i); } } @@ -294,7 +292,7 @@ int generic_init_device(struct vm_device * dev) { return 0; } -int generic_deinit_device(struct vm_device * dev) { +static int generic_deinit_device(struct vm_device * dev) { struct generic_internal * state = (struct generic_internal *)(dev->private_data); @@ -313,7 +311,7 @@ int generic_deinit_device(struct vm_device * dev) { for (i = cur->start; i <= cur->end; i++) { - if (dev_unhook_irq(dev, i)) { + if (v3_dev_unhook_irq(dev, i)) { PrintDebug("generic: can't unhook irq 0x%x (already unhooked?)\n", i); } } @@ -336,7 +334,7 @@ int generic_deinit_device(struct vm_device * dev) { PrintDebug("generic: unhooking addresses 0x%x to 0x%x\n", cur->start, cur->end); - if (dev_unhook_mem(dev, cur->start, cur->end)) { + if (v3_dev_unhook_mem(dev, cur->start, cur->end)) { PrintDebug("generic: Can't unhook addresses 0x%x to 0x%x (already unhooked?)\n", cur->start, cur->end); } @@ -361,7 +359,7 @@ int generic_deinit_device(struct vm_device * dev) { cur->start, cur->end); for (i = cur->start; i <= cur->end; i++) { - if (dev_unhook_io(dev, i)) { + if (v3_dev_unhook_io(dev, i)) { PrintDebug("generic: can't unhook port 0x%x (already unhooked?)\n", i); } } @@ -463,7 +461,7 @@ int v3_generic_add_irq_range(struct vm_device * dev, uint_t start, uint_t end, u -struct vm_device * create_generic() { +struct vm_device * v3_create_generic() { struct generic_internal * generic_state = (struct generic_internal *)V3_Malloc(sizeof(struct generic_internal)); generic_state->num_port_ranges = 0; @@ -474,7 +472,7 @@ struct vm_device * create_generic() { INIT_LIST_HEAD(&(generic_state->mem_list)); INIT_LIST_HEAD(&(generic_state->irq_list)); - struct vm_device * device = create_device("GENERIC", &dev_ops, generic_state); + struct vm_device * device = v3_create_device("GENERIC", &dev_ops, generic_state); return device; }