X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fbochs_debug.c;h=b834ba30e77231381cf12eb196fa9126aa4fd904;hb=4bc3ee757b44d3e466fd89e348106c47fa5511ee;hp=45bc75139750ed7d84b303931662e51f2e7a7c57;hpb=9b4bfeefac09294a6f0ae12dbadf102eb547f5ec;p=palacios.git diff --git a/palacios/src/devices/bochs_debug.c b/palacios/src/devices/bochs_debug.c index 45bc751..b834ba3 100644 --- a/palacios/src/devices/bochs_debug.c +++ b/palacios/src/devices/bochs_debug.c @@ -31,114 +31,114 @@ struct debug_state { - char debug_buf[BUF_SIZE]; - uint_t debug_offset; + char debug_buf[BUF_SIZE]; + uint_t debug_offset; - char info_buf[BUF_SIZE]; - uint_t info_offset; + char info_buf[BUF_SIZE]; + uint_t info_offset; }; static int handle_info_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct debug_state * state = (struct debug_state *)dev->private_data; + struct debug_state * state = (struct debug_state *)dev->private_data; - state->info_buf[state->info_offset++] = *(char*)src; + state->info_buf[state->info_offset++] = *(char*)src; - if ((*(char*)src == 0xa) || (state->info_offset == (BUF_SIZE - 1))) { - PrintDebug("BOCHSINFO>%s", state->info_buf); - memset(state->info_buf, 0, BUF_SIZE); - state->info_offset = 0; - } + if ((*(char*)src == 0xa) || (state->info_offset == (BUF_SIZE - 1))) { + PrintDebug("BOCHSINFO>%s", state->info_buf); + memset(state->info_buf, 0, BUF_SIZE); + state->info_offset = 0; + } - return length; + return length; } static int handle_debug_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct debug_state * state = (struct debug_state *)dev->private_data; + struct debug_state * state = (struct debug_state *)dev->private_data; - state->debug_buf[state->debug_offset++] = *(char*)src; + state->debug_buf[state->debug_offset++] = *(char*)src; - if ((*(char*)src == 0xa) || (state->debug_offset == (BUF_SIZE - 1))) { - PrintDebug("BOCHSDEBUG>%s", state->debug_buf); - memset(state->debug_buf, 0, BUF_SIZE); - state->debug_offset = 0; - } + if ((*(char*)src == 0xa) || (state->debug_offset == (BUF_SIZE - 1))) { + PrintDebug("BOCHSDEBUG>%s", state->debug_buf); + memset(state->debug_buf, 0, BUF_SIZE); + state->debug_offset = 0; + } - return length; + return length; } static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - switch (length) { - case 1: - PrintDebug(">0x%.2x\n", *(uchar_t*)src); - break; - case 2: - PrintDebug(">0x%.4x\n", *(ushort_t*)src); - break; - case 4: - PrintDebug(">0x%.8x\n", *(uint_t*)src); - break; - default: - PrintError("Invalid length in handle_gen_write\n"); - return -1; - break; - } - - return length; + switch (length) { + case 1: + PrintDebug(">0x%.2x\n", *(uchar_t*)src); + break; + case 2: + PrintDebug(">0x%.4x\n", *(ushort_t*)src); + break; + case 4: + PrintDebug(">0x%.8x\n", *(uint_t*)src); + break; + default: + PrintError("Invalid length in handle_gen_write\n"); + return -1; + break; + } + + return length; } static int debug_init(struct vm_device * dev) { - struct debug_state * state = (struct debug_state *)dev->private_data; + struct debug_state * state = (struct debug_state *)dev->private_data; - state->debug_offset = 0; - state->info_offset = 0; - memset(state->debug_buf, 0, BUF_SIZE); - memset(state->info_buf, 0, BUF_SIZE); + state->debug_offset = 0; + state->info_offset = 0; + memset(state->debug_buf, 0, BUF_SIZE); + memset(state->info_buf, 0, BUF_SIZE); - v3_dev_hook_io(dev, BOCHS_PORT1, NULL, &handle_gen_write); - v3_dev_hook_io(dev, BOCHS_PORT2, NULL, &handle_gen_write); - v3_dev_hook_io(dev, BOCHS_INFO_PORT, NULL, &handle_info_write); - v3_dev_hook_io(dev, BOCHS_DEBUG_PORT, NULL, &handle_debug_write); + v3_dev_hook_io(dev, BOCHS_PORT1, NULL, &handle_gen_write); + v3_dev_hook_io(dev, BOCHS_PORT2, NULL, &handle_gen_write); + v3_dev_hook_io(dev, BOCHS_INFO_PORT, NULL, &handle_info_write); + v3_dev_hook_io(dev, BOCHS_DEBUG_PORT, NULL, &handle_debug_write); - return 0; + return 0; } static int debug_deinit(struct vm_device * dev) { - v3_dev_unhook_io(dev, BOCHS_PORT1); - v3_dev_unhook_io(dev, BOCHS_PORT2); - v3_dev_unhook_io(dev, BOCHS_INFO_PORT); - v3_dev_unhook_io(dev, BOCHS_DEBUG_PORT); + v3_dev_unhook_io(dev, BOCHS_PORT1); + v3_dev_unhook_io(dev, BOCHS_PORT2); + v3_dev_unhook_io(dev, BOCHS_INFO_PORT); + v3_dev_unhook_io(dev, BOCHS_DEBUG_PORT); - return 0; + return 0; }; static struct vm_device_ops dev_ops = { - .init = debug_init, - .deinit = debug_deinit, - .reset = NULL, - .start = NULL, - .stop = NULL, + .init = debug_init, + .deinit = debug_deinit, + .reset = NULL, + .start = NULL, + .stop = NULL, }; struct vm_device * v3_create_bochs_debug() { - struct debug_state * state = NULL; + struct debug_state * state = NULL; - state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state)); + state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state)); - V3_ASSERT(state != NULL); + V3_ASSERT(state != NULL); - PrintDebug("Creating Bochs Debug Device\n"); - struct vm_device * device = v3_create_device("BOCHS Debug", &dev_ops, state); + PrintDebug("Creating Bochs Debug Device\n"); + struct vm_device * device = v3_create_device("BOCHS Debug", &dev_ops, state); - return device; + return device; }