X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=51c3f042af12b32820a31fe85abc4e6b63d1edae;hb=4c4382c3fa7e7e87c260b6bb473220d0081ca1d5;hp=f330a8bd7eda9f854a8cca3f0869bb42f5e60a58;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index f330a8b..51c3f04 100644
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -42,9 +42,11 @@
 #define CHANNEL1_PORT 0x41
 #define CHANNEL2_PORT 0x42
 #define COMMAND_PORT 0x43
+#define SPEAKER_PORT 0x61
 
 
 #define PIT_INTR_NUM 0
+#define PIT_SPEAKER_GATE 0x01
 
 /* The order of these typedefs is important because the numerical values correspond to the 
  * values coming from the io ports
@@ -88,6 +90,7 @@ struct pit {
     struct channel ch_0;
     struct channel ch_1;
     struct channel ch_2;
+    uint8_t speaker;
 };
 
 
@@ -301,7 +304,7 @@ static void pit_update_time(struct guest_info * info, ullong_t cpu_cycles, ullon
 	}
 
 	//handle_crystal_tics(dev, &(state->ch_1), oscillations);
-	//handle_crystal_tics(dev, &(state->ch_2), oscillations);
+	handle_crystal_tics(dev, &(state->ch_2), oscillations);
     }
   
 
@@ -311,6 +314,12 @@ static void pit_update_time(struct guest_info * info, ullong_t cpu_cycles, ullon
 }
 
 
+static void pit_advance_time(struct guest_info * core, void * private_data) {
+
+    v3_raise_irq(core->vm_info, 0);
+}
+
+
 
 /* This should call out to handle_SQR_WAVE_write, etc...
  */
@@ -407,9 +416,20 @@ static int handle_channel_read(struct channel * ch, char * val) {
 
 }
 
+static int handle_speaker_read(uint8_t *speaker, struct channel * ch, char * val) {
+    *val = *speaker;
 
+    if ((*speaker & PIT_SPEAKER_GATE)) {
+    	*val |= (ch->output_pin << 5);
+    }
+    
+    return 0;
+}
 
-
+static int handle_speaker_write(uint8_t *speaker, struct channel * ch, char val) {
+    *speaker = (val & ~0x20);
+    return 0;
+}
 
 static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) {
     ch->op_mode = cmd.op_mode;
@@ -493,6 +513,12 @@ static int pit_read_channel(struct guest_info * core, ushort_t port, void * dst,
 		return -1;
 	    }
 	    break;
+	case SPEAKER_PORT:
+	    if (handle_speaker_read(&state->speaker, &(state->ch_2), val) == -1) {
+		PrintError("SPEAKER read error\n");
+		return -1;
+	    }
+	    break;
 	default:
 	    PrintError("8254 PIT: Read from invalid port (%d)\n", port);
 	    return -1;
@@ -534,6 +560,12 @@ static int pit_write_channel(struct guest_info * core, ushort_t port, void * src
 		return -1;
 	    }
 	    break;
+	case SPEAKER_PORT:
+	    if (handle_speaker_write(&state->speaker, &(state->ch_2), val) == -1) {
+		PrintError("SPEAKER write error\n");
+		return -1;
+	    }
+	    break;
 	default:
 	    PrintError("8254 PIT: Write to invalid port (%d)\n", port);
 	    return -1;
@@ -593,6 +625,7 @@ static int pit_write_command(struct guest_info * core, ushort_t port, void * src
 
 static struct vm_timer_ops timer_ops = {
     .update_time = pit_update_time,
+    .advance_timer = pit_advance_time,
 };
 
 
@@ -636,7 +669,7 @@ static struct v3_device_ops dev_ops = {
 static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct pit * pit_state = NULL;
     struct vm_device * dev = NULL;
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
     
     // PIT is only usable in non-multicore environments
     // just hardcode the core context
@@ -647,11 +680,12 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     pit_state = (struct pit *)V3_Malloc(sizeof(struct pit));
     V3_ASSERT(pit_state != NULL);
+    pit_state->speaker = 0;
 
-    dev = v3_allocate_device(name, &dev_ops, pit_state);
+    dev = v3_allocate_device(dev_id, &dev_ops, pit_state);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", name);
+	PrintError("Could not attach device %s\n", dev_id);
 	return -1;
     }
 
@@ -659,10 +693,11 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     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);
+    v3_dev_hook_io(dev, SPEAKER_PORT, &pit_read_channel, &pit_write_channel);
 
 #ifdef CONFIG_DEBUG_PIT
     PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ);
-    PrintTraceLL(reload_val);
+    //PrintTrace(reload_val);
     PrintDebug("\n");
 #endif
 
@@ -683,7 +718,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
 #ifdef CONFIG_DEBUG_PIT
     PrintDebug("8254 PIT: CPU MHZ=%d -- pit count=", cpu_khz / 1000);
-    PrintTraceLL(pit_state->pit_counter);
+    //PrintTraceLL(pit_state->pit_counter);
     PrintDebug("\n");
 #endif