X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=1de80e9eca506fc04ae2eaee55091e80db564eca;hb=d7645f84d2e53a8f698960dff574fb6ae4a8a3c7;hp=fd9ab38523145a019ae20c6975133c48b64bbd18;hpb=4bc3ee757b44d3e466fd89e348106c47fa5511ee;p=palacios.git

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index fd9ab38..1de80e9 100644
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -154,6 +154,10 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint
     } 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) {
@@ -206,9 +210,16 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint
 
 	    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:
@@ -337,6 +348,7 @@ static int handle_channel_write(struct channel * ch, char val) {
 	    PrintDebug("8254 PIT: Channel Run State=%d\n", ch->run_state);
 	    break;
 	default:
+	    PrintError("Invalid Access state\n");
 	    return -1;
     }
     
@@ -354,7 +366,11 @@ static int handle_channel_write(struct channel * ch, char val) {
 	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;
     }
@@ -430,7 +446,11 @@ static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) {
 	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;
     }
 
@@ -455,16 +475,19 @@ static int pit_read_channel(ushort_t port, void * dst, uint_t length, struct vm_
     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;
@@ -493,16 +516,19 @@ static int pit_write_channel(ushort_t port, void * src, uint_t length, struct vm
     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;
@@ -531,21 +557,25 @@ static int pit_write_command(ushort_t port, void * src, uint_t length, struct vm
     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: