X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fnvram.c;h=59e200303b6470328cc6fa5b2e148f0422f897c1;hb=165560d91368d638b177022f883d3723d7618944;hp=da76b67b5be838ff93677eb9f9b89ecc3b6c41f2;hpb=56f8088296ee4116a4811a2f4f843edd80a7748d;p=palacios.git diff --git a/palacios/src/devices/nvram.c b/palacios/src/devices/nvram.c index da76b67..59e2003 100644 --- a/palacios/src/devices/nvram.c +++ b/palacios/src/devices/nvram.c @@ -1,5 +1,22 @@ -/* (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 + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #include #include @@ -115,21 +132,14 @@ struct rtc_statd { -struct vm_device * thedev = NULL; - -static struct vm_device * demultiplex_timer_interrupt(uint_t period_us) -{ - // hack - return thedev; -} - struct bcd_num { uchar_t bot : 4; uchar_t top : 4; -} ; +}; + + -static uchar_t add_to(uchar_t * left, uchar_t * right, uchar_t bcd) -{ +static uchar_t add_to(uchar_t * left, uchar_t * right, uchar_t bcd) { uchar_t temp; if (bcd) { @@ -156,12 +166,10 @@ static uchar_t add_to(uchar_t * left, uchar_t * right, uchar_t bcd) return 0; } } - } -static uchar_t days_in_month(struct vm_device *dev, uchar_t month, uchar_t bcd) -{ +static uchar_t days_in_month(struct vm_device * dev, uchar_t month, uchar_t bcd) { // This completely ignores Julian / Gregorian stuff right now if (bcd) { @@ -219,8 +227,7 @@ static uchar_t days_in_month(struct vm_device *dev, uchar_t month, uchar_t bcd) } -static void update_time(struct vm_device *dev, uint_t period_us) -{ +static void update_time(struct vm_device * dev, uint_t period_us) { struct nvram_internal * data = (struct nvram_internal *) (dev->private_data); struct rtc_stata * stata = (struct rtc_stata *) &((data->mem_state[NVRAM_REG_STAT_A])); struct rtc_statb * statb = (struct rtc_statb *) &((data->mem_state[NVRAM_REG_STAT_B])); @@ -402,28 +409,34 @@ static void update_time(struct vm_device *dev, uint_t period_us) // Interrupt associated VM, if needed if (statc->irq) { PrintDebug("nvram: injecting interrupt\n"); - dev->vm->vm_ops.raise_irq(dev->vm, NVRAM_RTC_IRQ); + v3_raise_irq(dev->vm, NVRAM_RTC_IRQ); } } +static int handle_timer_event(struct guest_info * info, + struct v3_timer_event * evt, + void * priv_data) { - -void deliver_timer_interrupt_to_vmm(uint_t period_us) -{ - struct vm_device * dev = demultiplex_timer_interrupt(period_us); + struct vm_device * dev = (struct vm_device *)priv_data; if (dev) { - update_time(dev, period_us); + update_time(dev, evt->period_us); } + return 0; } - -static int set_nvram_defaults(struct vm_device * dev) -{ +static int set_nvram_defaults(struct vm_device * dev) { + struct guest_info * info = dev->vm; struct nvram_internal * nvram_state = (struct nvram_internal *)dev->private_data; - + + /* TODO: + * The amount of ram in the system is stored in info->mem_size + * We need to reflect that value correctly here + */ + PrintError("TODO: Set the nvram memory register to reflect info->mem_size (%p)\n", (void *)(info->mem_size)); + // // 2 1.44 MB floppy drives @@ -508,16 +521,13 @@ static int set_nvram_defaults(struct vm_device * dev) nvram_state->pus = 0; return 0; - } -int nvram_reset_device(struct vm_device * dev) -{ +static int nvram_reset_device(struct vm_device * dev) { struct nvram_internal * data = (struct nvram_internal *) dev->private_data; PrintDebug("nvram: reset device\n"); - data->dev_state = NVRAM_READY; data->thereg = 0; @@ -529,15 +539,13 @@ int nvram_reset_device(struct vm_device * dev) -int nvram_start_device(struct vm_device *dev) -{ +static int nvram_start_device(struct vm_device * dev) { PrintDebug("nvram: start device\n"); return 0; } -int nvram_stop_device(struct vm_device *dev) -{ +static int nvram_stop_device(struct vm_device * dev) { PrintDebug("nvram: stop device\n"); return 0; } @@ -545,11 +553,10 @@ int nvram_stop_device(struct vm_device *dev) -int nvram_write_reg_port(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int nvram_write_reg_port(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { struct nvram_internal * data = (struct nvram_internal *)dev->private_data; memcpy(&(data->thereg), src, 1); @@ -559,14 +566,11 @@ int nvram_write_reg_port(ushort_t port, return 1; } -int nvram_read_data_port(ushort_t port, - void * dst, - uint_t length, - struct vm_device * dev) -{ - struct nvram_internal * data = (struct nvram_internal *) dev->private_data; - - +static int nvram_read_data_port(ushort_t port, + void * dst, + uint_t length, + struct vm_device * dev) { + struct nvram_internal * data = (struct nvram_internal *)dev->private_data; memcpy(dst, &(data->mem_state[data->thereg]), 1); @@ -581,11 +585,10 @@ int nvram_read_data_port(ushort_t port, return 1; } -int nvram_write_data_port(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int nvram_write_data_port(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { struct nvram_internal * data = (struct nvram_internal *)dev->private_data; memcpy(&(data->mem_state[data->thereg]), src, 1); @@ -597,9 +600,9 @@ int nvram_write_data_port(ushort_t port, -int nvram_init_device(struct vm_device * dev) { - - struct nvram_internal * data = (struct nvram_internal *) dev->private_data; +static int nvram_init_device(struct vm_device * dev) { + + struct nvram_internal * data = (struct nvram_internal *)dev->private_data; PrintDebug("nvram: init_device\n"); @@ -607,22 +610,23 @@ int nvram_init_device(struct vm_device * dev) { // Would read state here set_nvram_defaults(dev); + + nvram_reset_device(dev); // hook ports - dev_hook_io(dev, NVRAM_REG_PORT, NULL, &nvram_write_reg_port); - dev_hook_io(dev, NVRAM_DATA_PORT, &nvram_read_data_port, &nvram_write_data_port); + v3_dev_hook_io(dev, NVRAM_REG_PORT, NULL, &nvram_write_reg_port); + v3_dev_hook_io(dev, NVRAM_DATA_PORT, &nvram_read_data_port, &nvram_write_data_port); + v3_hook_host_event(dev->vm, HOST_TIMER_EVT, V3_HOST_EVENT_HANDLER(handle_timer_event), dev); + return 0; } -int nvram_deinit_device(struct vm_device *dev) -{ - - - dev_unhook_io(dev, NVRAM_REG_PORT); - dev_unhook_io(dev, NVRAM_DATA_PORT); +static int nvram_deinit_device(struct vm_device * dev) { + v3_dev_unhook_io(dev, NVRAM_REG_PORT); + v3_dev_unhook_io(dev, NVRAM_DATA_PORT); nvram_reset_device(dev); return 0; @@ -643,18 +647,14 @@ static struct vm_device_ops dev_ops = { -struct vm_device * create_nvram() { - struct nvram_internal * nvram_state = (struct nvram_internal *)V3_Malloc(sizeof(struct nvram_internal) + 1000); +struct vm_device * v3_create_nvram() { + struct nvram_internal * nvram_state = NULL; - PrintDebug("nvram: internal at %x\n",nvram_state); + nvram_state = (struct nvram_internal *)V3_Malloc(sizeof(struct nvram_internal) + 1000); - struct vm_device * device = create_device("NVRAM", &dev_ops, nvram_state); - - if (thedev != NULL) { - PrintDebug("nvram: warning! overwriting thedev\n"); - } + PrintDebug("nvram: internal at %x\n", nvram_state); - thedev = device; + struct vm_device * device = v3_create_device("NVRAM", &dev_ops, nvram_state); return device; }