#include <palacios/vmm_emulator.h>
#include <palacios/vm_guest_mem.h>
-#include <devices/cga.h>
+#include <devices/console.h>
+
-/*
#ifndef DEBUG_CGA
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
-*/
+
#define START_ADDR 0xB8000
#define END_ADDR 0xC0000
uint8_t crtc_index_reg; // io port 3D4
uint8_t crtc_data_regs[25]; // io port 3D5
-
+
+ /* IMPORTANT: These are column offsets _NOT_ byte offsets */
uint16_t screen_offset; // relative to the framebuffer
uint16_t cursor_offset; // relative to the framebuffer
+ /* ** */
// updating the screen offset is not atomic,
// so we need a temp variable to hold the partial update
}
}
-static int video_write_mem(addr_t guest_addr, void * dest, uint_t length, void * priv_data) {
+static int video_write_mem(struct guest_info * core, addr_t guest_addr, void * dest, uint_t length, void * priv_data) {
struct vm_device * dev = (struct vm_device *)priv_data;
struct video_internal * state = (struct video_internal *)dev->private_data;
uint_t fb_offset = guest_addr - START_ADDR;
uint_t screen_byte_offset = state->screen_offset * BYTES_PER_COL;
+ uint_t screen_length;
PrintDebug("Guest address: %p length = %d, fb_offset=%d, screen_offset=%d\n",
(void *)guest_addr, length, fb_offset, screen_byte_offset);
if (state->ops) {
PrintDebug("\tcalling update_screen()\n");
- state->ops->update_screen(x, y, length, state->private_data);
+
+ /* avoid updates past end of screen */
+ screen_length = SCREEN_SIZE - screen_byte_offset;
+ if (screen_length > length) screen_length = length;
+ state->ops->update_screen(x, y, screen_length, state->private_data);
}
}
return length;
}
-static int video_read_port(uint16_t port, void * dest, uint_t length, struct vm_device * dev) {
+static int video_read_port(struct guest_info * core, uint16_t port, void * dest, uint_t length, struct vm_device * dev) {
struct video_internal * video_state = (struct video_internal *)dev->private_data;
-static int video_write_port(uint16_t port, void * src, uint_t length, struct vm_device * dev) {
+static int video_write_port(struct guest_info * core, uint16_t port, void * src, uint_t length, struct vm_device * dev) {
struct video_internal * video_state = (struct video_internal *)dev->private_data;
-static int crtc_data_write(uint16_t port, void * src, uint_t length, struct vm_device * dev) {
+static int crtc_data_write(struct guest_info * core, uint16_t port, void * src, uint_t length, struct vm_device * dev) {
struct video_internal * video_state = (struct video_internal *)dev->private_data;
uint8_t val = *(uint8_t *)src;
uint_t index = video_state->crtc_index_reg;
}
-static int crtc_index_write(uint16_t port, void * src, uint_t length, struct vm_device * dev) {
+static int crtc_index_write(struct guest_info * core, uint16_t port, void * src, uint_t length, struct vm_device * dev) {
struct video_internal * video_state = (struct video_internal *)dev->private_data;
if (length > 2) {
}
if (length == 2) {
- if (crtc_data_write(port + 1, src + 1, length - 1, dev) != (length - 1)) {
+ if (crtc_data_write(core, port + 1, src + 1, length - 1, dev) != (length - 1)) {
PrintError("could not handle implicit crtc data write\n");
return -1;
}
static int free_device(struct vm_device * dev) {
- v3_unhook_mem(dev->vm, START_ADDR);
+ struct video_internal * video_state = (struct video_internal *)dev->private_data;
+
+ v3_unhook_mem(dev->vm, V3_MEM_CORE_ANY, START_ADDR);
+
+ V3_Free(video_state);
+
return 0;
}
static struct v3_device_ops dev_ops = {
.free = free_device,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
};
-static int cga_init(struct guest_info * vm, void * cfg_data) {
- struct video_internal * video_state = (struct video_internal *)V3_Malloc(sizeof(struct video_internal));
+static int cga_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
+ struct video_internal * video_state = NULL;
addr_t frame_buf_pa = 0;
- uint32_t enable_passthrough = (uint32_t)(addr_t)cfg_data;
+ int enable_passthrough = 0;
+ char * dev_id = v3_cfg_val(cfg, "ID");
+ enable_passthrough = (strcasecmp(v3_cfg_val(cfg, "passthrough"), "enable") == 0) ? 1 : 0;
PrintDebug("video: init_device\n");
- struct vm_device * dev = v3_allocate_device("CGA_VIDEO", &dev_ops, video_state);
+ video_state = (struct video_internal *)V3_Malloc(sizeof(struct video_internal));
+
+ struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, video_state);
if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", "CGA_VIDEO");
+ PrintError("Could not attach device %s\n", dev_id);
+ V3_Free(video_state);
return -1;
}
if (enable_passthrough) {
PrintDebug("Enabling CGA Passthrough\n");
- if (v3_hook_write_mem(vm, START_ADDR, END_ADDR, START_ADDR, &video_write_mem, dev) == -1) {
+ if (v3_hook_write_mem(vm, V3_MEM_CORE_ANY, START_ADDR, END_ADDR, START_ADDR, &video_write_mem, dev) == -1) {
PrintDebug("\n\nVideo Hook failed.\n\n");
}
} else {
- if (v3_hook_write_mem(vm, START_ADDR, END_ADDR, frame_buf_pa, &video_write_mem, dev) == -1) {
+ if (v3_hook_write_mem(vm, V3_MEM_CORE_ANY, START_ADDR, END_ADDR, frame_buf_pa, &video_write_mem, dev) == -1) {
PrintDebug("\n\nVideo Hook failed.\n\n");
}
}