* redistribute, and modify it as specified in the file "V3VEE_LICENSE".
*/
-#include <devices/8254.h>
+
#include <palacios/vmm.h>
+#include <palacios/vmm_dev_mgr.h>
#include <palacios/vmm_time.h>
#include <palacios/vmm_util.h>
#include <palacios/vmm_intr.h>
+#include <palacios/vmm_config.h>
-
-#ifndef DEBUG_PIT
+#ifndef CONFIG_DEBUG_PIT
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
} else {
ushort_t reload_val = ch->reload_value;
+ if (ch->op_mode == SW_STROBE) {
+ reload_val = 0xffff;
+ }
+
// TODO: Check this....
// Is this correct???
if (reload_val == 0) {
break;
case SW_STROBE:
- return -1;
+
+ if (channel_cycles > 0) {
+ if (ch->output_pin == 1) {
+ ch->output_pin = 0;
+ output_changed = 1;
+ }
+ }
break;
case HW_STROBE:
+ PrintError("Hardware strobe not implemented\n");
return -1;
break;
default:
PrintDebug("8254 PIT: Channel Run State=%d\n", ch->run_state);
break;
default:
+ PrintError("Invalid Access state\n");
return -1;
}
case SQR_WAVE:
ch->output_pin = 1;
break;
+ case SW_STROBE:
+ ch->output_pin = 1;
+ break;
default:
+ PrintError("Invalid OP_MODE: %d\n", ch->op_mode);
return -1;
break;
}
case SQR_WAVE:
ch->output_pin = 1;
break;
+ case SW_STROBE:
+ ch->output_pin = 1;
+ break;
default:
+ PrintError("Invalid OP_MODE: %d\n", cmd.op_mode);
return -1;
}
switch (port) {
case CHANNEL0_PORT:
if (handle_channel_read(&(state->ch_0), val) == -1) {
+ PrintError("CHANNEL0 read error\n");
return -1;
}
break;
case CHANNEL1_PORT:
if (handle_channel_read(&(state->ch_1), val) == -1) {
+ PrintError("CHANNEL1 read error\n");
return -1;
}
break;
case CHANNEL2_PORT:
if (handle_channel_read(&(state->ch_2), val) == -1) {
+ PrintError("CHANNEL2 read error\n");
return -1;
}
break;
switch (port) {
case CHANNEL0_PORT:
if (handle_channel_write(&(state->ch_0), val) == -1) {
+ PrintError("CHANNEL0 write error\n");
return -1;
}
break;
case CHANNEL1_PORT:
if (handle_channel_write(&(state->ch_1), val) == -1) {
+ PrintError("CHANNEL1 write error\n");
return -1;
}
break;
case CHANNEL2_PORT:
if (handle_channel_write(&(state->ch_2), val) == -1) {
+ PrintError("CHANNEL2 write error\n");
return -1;
}
break;
switch (cmd->channel) {
case 0:
if (handle_channel_cmd(&(state->ch_0), *cmd) == -1) {
+ PrintError("CHANNEL0 command error\n");
return -1;
}
break;
case 1:
if (handle_channel_cmd(&(state->ch_1), *cmd) == -1) {
+ PrintError("CHANNEL1 command error\n");
return -1;
}
break;
case 2:
if (handle_channel_cmd(&(state->ch_2), *cmd) == -1) {
+ PrintError("CHANNEL2 command error\n");
return -1;
}
break;
case 3:
// Read Back command
+ PrintError("Read back command not implemented\n");
return -1;
break;
default:
}
-static int pit_init(struct vm_device * dev) {
- struct pit * state = (struct pit *)dev->private_data;
+
+
+static int pit_free(struct vm_device * dev) {
+
+ return 0;
+}
+
+
+static struct v3_device_ops dev_ops = {
+ .free = pit_free,
+ .reset = NULL,
+ .start = NULL,
+ .stop = NULL,
+
+};
+
+
+static int pit_init(struct guest_info * info, v3_cfg_tree_t * cfg) {
+ struct pit * pit_state = NULL;
+ struct vm_device * dev = NULL;
+ char * name = v3_cfg_val(cfg, "name");
+
uint_t cpu_khz = V3_CPU_KHZ();
ullong_t reload_val = (ullong_t)cpu_khz * 1000;
+ pit_state = (struct pit *)V3_Malloc(sizeof(struct pit));
+ V3_ASSERT(pit_state != NULL);
+
+ dev = v3_allocate_device(name, &dev_ops, pit_state);
+
+ if (v3_attach_device(info, dev) == -1) {
+ PrintError("Could not attach device %s\n", name);
+ return -1;
+ }
+
v3_dev_hook_io(dev, CHANNEL0_PORT, &pit_read_channel, &pit_write_channel);
v3_dev_hook_io(dev, CHANNEL1_PORT, &pit_read_channel, &pit_write_channel);
v3_dev_hook_io(dev, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel);
v3_dev_hook_io(dev, COMMAND_PORT, NULL, &pit_write_command);
-#ifdef DEBUG_PIT
+#ifdef CONFIG_DEBUG_PIT
PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ);
PrintTraceLL(reload_val);
PrintDebug("\n");
#endif
- v3_add_timer(dev->vm, &timer_ops, dev);
+ v3_add_timer(info, &timer_ops, dev);
// Get cpu frequency and calculate the global pit oscilattor counter/cycle
do_divll(reload_val, OSC_HZ);
- state->pit_counter = reload_val;
- state->pit_reload = reload_val;
+ pit_state->pit_counter = reload_val;
+ pit_state->pit_reload = reload_val;
- init_channel(&(state->ch_0));
- init_channel(&(state->ch_1));
- init_channel(&(state->ch_2));
+ init_channel(&(pit_state->ch_0));
+ init_channel(&(pit_state->ch_1));
+ init_channel(&(pit_state->ch_2));
-#ifdef DEBUG_PIT
+#ifdef CONFIG_DEBUG_PIT
PrintDebug("8254 PIT: CPU MHZ=%d -- pit count=", cpu_khz / 1000);
- PrintTraceLL(state->pit_counter);
+ PrintTraceLL(pit_state->pit_counter);
PrintDebug("\n");
#endif
return 0;
}
-static int pit_deinit(struct vm_device * dev) {
-
- return 0;
-}
-
-
-static struct vm_device_ops dev_ops = {
- .init = pit_init,
- .deinit = pit_deinit,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
-
-};
-
-struct vm_device * v3_create_pit() {
- struct pit * pit_state = NULL;
- pit_state = (struct pit *)V3_Malloc(sizeof(struct pit));
- V3_ASSERT(pit_state != NULL);
-
- struct vm_device * dev = v3_create_device("PIT", &dev_ops, pit_state);
-
- return dev;
-}
+device_register("8254_PIT", pit_init);
