X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=8e7dede87825dfa19a979058deee39f48416af20;hb=0956466aad020813d1e470df366d552fdabab2a9;hp=0c3608b86d92476531fe254ec5cafb05f56b3be2;hpb=e5e029575affad90c19ca038a3b780820535d421;p=palacios.git

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 0c3608b..8e7dede 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;
 };
 
 
@@ -159,12 +162,6 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint
 	    reload_val = 0xffff;
 	}
 
-	// TODO: Check this....
-	// Is this correct???
-	if (reload_val == 0) {
-	    reload_val = 1;
-	}
-
 	oscillations -= ch->counter;
 	ch->counter = 0;
 	channel_cycles = 1;
@@ -173,6 +170,12 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint
 	    reload_val -= reload_val % 2;
 	}
 
+	// TODO: Check this....
+	// Is this correct???
+	if (reload_val == 0) {
+	    reload_val = 1;
+	}
+
 	channel_cycles += oscillations / reload_val;
 	oscillations = oscillations % reload_val;
 
@@ -233,7 +236,7 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint
 
 #include <palacios/vm_guest.h>
 
-static void pit_update_time(struct guest_info * info, ullong_t cpu_cycles, ullong_t cpu_freq, void * private_data) {
+static void pit_update_timer(struct guest_info * info, ullong_t cpu_cycles, ullong_t cpu_freq, void * private_data) {
     struct vm_device * dev = (struct vm_device *)private_data;
     struct pit * state = (struct pit *)dev->private_data;
     //  ullong_t tmp_ctr = state->pit_counter;
@@ -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);
     }
   
 
@@ -310,14 +313,6 @@ static void pit_update_time(struct guest_info * info, ullong_t cpu_cycles, ullon
     return;
 }
 
-
-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...
  */
 static int handle_channel_write(struct channel * ch, char val) {
@@ -413,9 +408,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;
@@ -499,6 +505,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;
@@ -540,6 +552,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;
@@ -598,8 +616,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,
+    .update_timer = pit_update_timer,
 };
 
 
@@ -654,6 +671,7 @@ 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(dev_id, &dev_ops, pit_state);
 
@@ -666,6 +684,7 @@ 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);