- add svn:ignore property to make 'svn st' output more realistic

- remove old copy+paste+edit port of parts of librfid
- add ability to directly link librfid.a from mainline librfid
- make usb string descriptors optional again (config.h)
- fix TC_CDIV to reset correctly on swtrig (For OpenPICC)
- temporarily re-implement ep0_send_data() in pcd_enumerate.c
- make UDP_PUPv4 switching conditional to PCD
- introduce DEBUG_UNBUFFERED define in dbgu.c
- fix some signed/unsigned/typecast related compiler warnings
- remove dead code from src/os/led.c
- implement a 'mdelay' and 'usleep' stub function (FIXME!)
- rename rc632_... functions into opcd_rc632_... to avoid confusion
- introduce new 'main_librfid' TARGET
- make main_{reqa,analog} work with librfid rather than old code
- introduce mroe debugging options for FIQ handler code in Cstartup_app
- lots of PICC work that doesn't need comments now


git-svn-id: https://svn.openpcd.org:2342/trunk@266 6dc7ffe9-61d6-0310-9af1-9938baff3ed1

1 files changed, 3 insertions, 4 deletions

diff --git a/firmware/Makefile b/firmware/Makefile
index 8b79794..f4bf7ae 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -94,8 +94,7 @@ SRCARM += src/os/pcd_enumerate.c src/os/fifo.c src/os/dbgu.c \
 
 ifeq ($(BOARD), PCD)
 # PCD support code
-SRCARM += src/pcd/rc632.c src/pcd/rc632_highlevel.c \
-	  src/pcd/rfid_layer2_iso14443a.c
+SRCARM += src/pcd/rc632.c src/pcd/rc632_highlevel.c
 # finally, the actual main application 
 SRCARM += src/pcd/$(TARGET).c 
 endif
@@ -165,7 +164,7 @@ EXTRAINCDIRS =
 # List any extra directories to look for library files here.
 #     Each directory must be seperated by a space.
 #EXTRA_LIBDIRS = ../arm7_efsl_0_2_4
-EXTRA_LIBDIRS = 
+EXTRA_LIBDIRS = ../../librfid/src/.libs/
 
 ## Using the Atmel AT91_lib produces warning with
 ## the default warning-levels. 
@@ -266,7 +265,7 @@ ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:.S=.lst),--g$(DEBUGF) -Iinclude/ -D__ASSEMBLY
 #    To add libxyz.a, libabc.a and libefsl.a: 
 #    EXTRA_LIBS = xyz abc efsl
 #EXTRA_LIBS = efsl
-EXTRA_LIBS =
+EXTRA_LIBS = rfid
 
 #Support for newlibc-lpc (file: libnewlibc-lpc.a)
 #NEWLIBLPC = -lnewlib-lpc