- 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, 5 insertions, 3 deletions

diff --git a/firmware/src/picc/openpicc.c b/firmware/src/picc/openpicc.c
index 7b2b5f2..fa1f840 100644
--- a/firmware/src/picc/openpicc.c
+++ b/firmware/src/picc/openpicc.c
@@ -20,6 +20,7 @@ static u_int16_t opicc_regs[_OPICC_NUM_REGS] = {
 	[OPICC_REG_14443A_FDT0]		= 1236,
 	[OPICC_REG_14443A_FDT1]		= 1172,
 	[OPICC_REG_14443A_STATE]	= ISO14443A_ST_POWEROFF,
+	[OPICC_REG_14443A_ATQA]		= 0x0001,
 	[OPICC_REG_RX_CLK_DIV]		= 32,
 	[OPICC_REG_RX_CLK_PHASE]	= 0,
 	[OPICC_REG_RX_CONTROL]		= 0,
@@ -62,9 +63,10 @@ static int opicc_reg_usb_in(struct req_ctx *rctx)
 		break;
 	case OPENPCD_CMD_PICC_REG_WRITE:
 		if (rctx->tot_len < sizeof(*poh) + sizeof(u_int16_t)) {
-			poh->flags = OPENPCD_FLAG_ERROR;
-		}
-		opicc_reg_write(poh->reg, *val16);
+			/* we only have an 8bit write */
+			opicc_reg_write(poh->reg, poh->val);
+		} else
+			opicc_reg_write(poh->reg, *val16);
 		break;
 	default:
 		return USB_ERR(USB_ERR_CMD_UNKNOWN);