From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Mon, 15 Dec 2008 00:55:47 +0000 (-0500)
Subject: Merge nyus.joshuawise.com:/storage/git/netwatch
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/78a5ce51491a8657860a253832ad47618ea86a75?hp=0013b64e879f53d43df54b530d2c27525440cb9b

Merge nyus.joshuawise.com:/storage/git/netwatch
---

diff --git a/net/rfb.c b/net/rfb.c
index fff91bb..4f03092 100644
--- a/net/rfb.c
+++ b/net/rfb.c
@@ -255,7 +255,6 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
 				/* Checksum gets set in data block, AFTER the data has been sent. */
 			}
 
-			outputf("actually sent");
 			state->chunk_actually_sent = 1;
 
 			/* Send a header */
@@ -367,10 +366,10 @@ enum fsm_result {
 static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
 	int i;
 	int pktsize;
-
+/*
 	outputf("RFB FSM: st %d rp %d wp %d", state->state, state->readpos,
 		state->writepos);
-
+*/
 	switch(state->state) {
 	case ST_BEGIN:
 		if (state->writepos < 12) return NEEDMORE;
@@ -553,7 +552,9 @@ static err_t rfb_recv(void *arg, struct tcp_pcb *pcb,
 	}
 
 	copylen = pbuf_copy_partial(p, state->data + state->writepos, p->tot_len, 0);
+/*
 	outputf("RFB: Processing %d, wp %d, cp %d", p->tot_len, state->writepos, copylen);
+*/
 	state->writepos += p->tot_len;
 
 	tcp_recved(pcb, p->tot_len);
@@ -566,8 +567,6 @@ static err_t rfb_recv(void *arg, struct tcp_pcb *pcb,
 			goto doneprocessing;
 
 		case OK:
-			outputf("RFB FSM: ok");
-
 			if (state->readpos == state->writepos) {
 				state->readpos = 0;
 				state->writepos = 0;
diff --git a/video/text.c b/video/text.c
index 2d71dc1..4f35f97 100644
--- a/video/text.c
+++ b/video/text.c
@@ -69,9 +69,9 @@ void text_render(char *buf, int x, int y, int w, int h)
 	unsigned int cx, cy;
 	unsigned char ch, at, font;
 	smram_state_t old_state = smram_save_state();
-	
+/*
 	outputf("text_render: (%d,%d),(%d,%d)", x, y, w, h);
-	
+*/	
 	smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
 	for (cy = y; cy < (y + h); cy++)
 	{