From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Sat, 8 May 2010 15:43:38 +0000 (+0000)
Subject: Reverted Chipcon client to C implementation.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=a0a53c7bbe270a0c98c77b460eb56384a35c913c

Reverted Chipcon client to C implementation.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@482 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/firmware/Makefile b/firmware/Makefile
index 55953d2..8841106 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -27,7 +27,10 @@ moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o apps/glitch/glitch.o apps/jtag/s
 # should include apps/jtag/jtagarm7tdmi.o to build jtag for ARM7
 
 apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o apps/jtag/ejtag.o apps/jtag/jtagxscale.o
-libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o apps/chipcon/chipconasm.o
+
+#apps/chipcon/chipconasm.o removed
+libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o 
+
 app= goodfet
 
 all: $(app).hex
diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index ce0a9ff..fac551c 100644
--- a/firmware/apps/chipcon/chipcon.c
+++ b/firmware/apps/chipcon/chipcon.c
@@ -71,7 +71,7 @@ void ccsetup(){
   30:	30 41       	ret			
 */
 
-/*
+
 //! Initialize the debugger
 void ccdebuginit(){
   //Port output BUT NOT DIRECTION is set at start.
@@ -94,10 +94,6 @@ void ccdebuginit(){
   //Raise !RST.
   P5OUT|=RST;
 }
-*/
-
-//! Initialize the debugger.
-void ccdebuginit(); 
 
 //! Read and write a CC bit.
 unsigned char cctrans8(unsigned char byte){