- 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, 11 insertions, 1353 deletions

diff --git a/firmware/src/pcd/rc632_highlevel.c b/firmware/src/pcd/rc632_highlevel.c
index 0701da2..b83f52b 100644
--- a/firmware/src/pcd/rc632_highlevel.c
+++ b/firmware/src/pcd/rc632_highlevel.c
@@ -54,7 +54,7 @@ rc632_set_bit_mask(struct rfid_asic_handle *handle,
 	int ret;
 	u_int8_t tmp;
 
-	ret = rc632_reg_read(handle, reg, &tmp);
+	ret = opcd_rc632_reg_read(handle, reg, &tmp);
 	if (ret < 0)
 		return ret;
 
@@ -62,317 +62,38 @@ rc632_set_bit_mask(struct rfid_asic_handle *handle,
 	if ((tmp & mask) == val)
 		return 0;
 
-	return rc632_reg_write(handle, reg, (tmp & ~mask)|(val & mask));
+	return opcd_rc632_reg_write(handle, reg, (tmp & ~mask)|(val & mask));
 }
 
 int 
 rc632_turn_on_rf(struct rfid_asic_handle *handle)
 {
 	ENTER();
-	return rc632_set_bits(handle, RC632_REG_TX_CONTROL, 0x03);
+	return opcd_rc632_set_bits(handle, RC632_REG_TX_CONTROL, 0x03);
 }
 
 int 
 rc632_turn_off_rf(struct rfid_asic_handle *handle)
 {
 	ENTER();
-	return rc632_clear_bits(handle, RC632_REG_TX_CONTROL, 0x03);
+	return opcd_rc632_clear_bits(handle, RC632_REG_TX_CONTROL, 0x03);
 }
 
 static int
 rc632_power_up(struct rfid_asic_handle *handle)
 {
 	ENTER();
-	return rc632_clear_bits(handle, RC632_REG_CONTROL, 
+	return opcd_rc632_clear_bits(handle, RC632_REG_CONTROL, 
 				RC632_CONTROL_POWERDOWN);
 }
 
 static int
 rc632_power_down(struct rfid_asic_handle *handle)
 {
-	return rc632_set_bits(handle, RC632_REG_CONTROL,
+	return opcd_rc632_set_bits(handle, RC632_REG_CONTROL,
 			      RC632_CONTROL_POWERDOWN);
 }
 
-/* calculate best 8bit prescaler and divisor for given usec timeout */
-static int best_prescaler(u_int64_t timeout, u_int8_t *prescaler,
-			  u_int8_t *divisor)
-{
-	u_int8_t best_presc, best_divisor, i;
-	int64_t smallest_diff;
-
-	smallest_diff = 0x7fffffffffffffff;
-	best_presc = 0;
-
-	for (i = 0; i < 21; i++) {
-		u_int64_t clk, tmp_div, res;
-		int64_t diff;
-		clk = 13560000 / (1 << i);
-		tmp_div = (clk * timeout) / 1000000;
-		tmp_div++;
-
-		if (tmp_div > 0xff)
-			continue;
-
-		res = 1000000 / (clk / tmp_div);
-		diff = res - timeout;
-
-		if (diff < 0)
-			continue;
-
-		if (diff < smallest_diff) {
-			best_presc = i;
-			best_divisor = tmp_div;
-			smallest_diff = diff;
-		}
-	}
-
-	*prescaler = best_presc;
-	*divisor = best_divisor;
-
-	DEBUGPCRF("timeout %u usec, prescaler = %u, divisor = %u", timeout, best_presc, best_divisor);
-
-	return 0;
-}
-
-static int
-rc632_timer_set(struct rfid_asic_handle *handle,
-		u_int64_t timeout)
-{
-	int ret;
-	u_int8_t prescaler, divisor;
-
-	ret = best_prescaler(timeout*RC632_TIMEOUT_FUZZ_FACTOR, 
-			     &prescaler, &divisor);
-
-	ret = rc632_reg_write(handle, RC632_REG_TIMER_CLOCK,
-			      prescaler & 0x1f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_TIMER_CONTROL,
-			      RC632_TMR_START_TX_END|RC632_TMR_STOP_RX_BEGIN);
-
-	/* clear timer irq bit */
-	ret |= rc632_set_bits(handle, RC632_REG_INTERRUPT_RQ, RC632_INT_TIMER);
-
-#ifdef USE_IRQ_
-	/* enable interrupt for expired timer */
-	ret |= rc632_reg_write(handle, RC632_REG_INTERRUPT_EN,
-			       RC632_INT_TIMER|RC632_INT_SET);
-#endif
-
-	ret |= rc632_reg_write(handle, RC632_REG_TIMER_RELOAD, divisor);
-
-	return ret;
-}
-
-/* Wait until RC632 is idle or TIMER IRQ has happened */
-static int rc632_wait_idle_timer(struct rfid_asic_handle *handle)
-{
-	int ret;
-	u_int8_t irq, cmd;
-
-	while (1) {
-		ret = rc632_reg_read(handle, RC632_REG_INTERRUPT_RQ, &irq);
-		if (ret < 0)
-			return ret;
-
-		/* FIXME: currently we're lazy:  If we actually received
-		 * something even after the timer expired, we accept it */
-		if (irq & RC632_INT_TIMER && !(irq & RC632_INT_RX)) {
-			u_int8_t foo;
-			rc632_reg_read(handle, RC632_REG_PRIMARY_STATUS, &foo);
-			DEBUGPCRF("TIMER && !INT_RX, PRIM_STATUS=0x%02x", foo);
-			if (foo & 0x04) {
-				rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &foo);
-				DEBUGPCRF("ERROR_FLAG=0x%02x, returning timeout", foo);
-			}
-
-			return -ETIMEDOUT;
-		}
-
-		ret = rc632_reg_read(handle, RC632_REG_COMMAND, &cmd);
-		if (ret < 0)
-			return ret;
-
-		if (cmd == 0 || irq & RC632_INT_RX)
-			return 0;
-
-		/* poll every millisecond */
-		/* FIXME usleep(1000);*/
-	}
-}
-
-/* Stupid RC632 implementations don't evaluate interrupts but poll the
- * command register for "status idle" */
-static int
-rc632_wait_idle(struct rfid_asic_handle *handle, u_int64_t timeout)
-{
-	u_int8_t cmd = 0xff;
-	int ret, cycles = 0;
-#define USLEEP_PER_CYCLE	128
-
-	while (cmd != 0) {
-		ret = rc632_reg_read(handle, RC632_REG_COMMAND, &cmd);
-		if (ret < 0)
-			return ret;
-
-		if (cmd == 0) {
-			/* FIXME: read second time ?? */
-			return 0;
-		}
-
-		{
-			u_int8_t foo;
-			rc632_reg_read(handle, RC632_REG_PRIMARY_STATUS, &foo);
-			if (foo & 0x04)
-				rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &foo);
-		}
-
-		/* Abort after some timeout */
-		if (cycles > timeout*RC632_TIMEOUT_FUZZ_FACTOR/USLEEP_PER_CYCLE) {
-			return -ETIMEDOUT;
-		}
-
-		cycles++;
-		usleep(USLEEP_PER_CYCLE);
-	}
-
-	return 0;
-}
-
-static int
-rc632_transmit(struct rfid_asic_handle *handle,
-		const u_int8_t *buf,
-		u_int8_t len,
-		u_int64_t timeout)
-{
-	int ret, cur_len;
-	const u_int8_t *cur_buf = buf;
-
-	if (len > 64)
-		cur_len = 64;
-	else
-		cur_len = len;
-	
-	do {
-		ret = rc632_fifo_write(handle, cur_len, cur_buf, 0x03);
-		if (ret < 0)
-			return ret;
-
-		if (cur_buf == buf)  {
-			/* only start transmit first time */
-			ret = rc632_reg_write(handle, RC632_REG_COMMAND,
-					      RC632_CMD_TRANSMIT);
-			if (ret < 0)
-				return ret;
-		}
-
-		cur_buf += cur_len;
-		if (cur_buf < buf + len) {
-			cur_len = buf - cur_buf;
-			if (cur_len > 64)
-				cur_len = 64;
-		} else
-			cur_len = 0;
-
-	} while (cur_len);
-
-	return rc632_wait_idle(handle, timeout);
-}
-
-static int
-tcl_toggle_pcb(struct rfid_asic_handle *handle)
-{
-	// FIXME: toggle something between 0x0a and 0x0b
-	return 0;
-}
-
-static int
-rc632_transceive(struct rfid_asic_handle *handle,
-		 const u_int8_t *tx_buf,
-		 u_int8_t tx_len,
-		 u_int8_t *rx_buf,
-		 u_int8_t *rx_len,
-		 u_int64_t timer,
-		 unsigned int toggle)
-{
-	int ret, cur_tx_len;
-	const u_int8_t *cur_tx_buf = tx_buf;
-
-	DEBUGPCRF("tx_len=%u, rx_len=%u, timer=%llu", tx_len, *rx_len, timer);
-
-	if (tx_len > 64)
-		cur_tx_len = 64;
-	else
-		cur_tx_len = tx_len;
-
-	ret = rc632_reg_write(handle, RC632_REG_COMMAND, 0x00);
-	/* clear all interrupts */
-	ret = rc632_reg_write(handle, RC632_REG_INTERRUPT_RQ, 0x7f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_timer_set(handle, timer);
-	if (ret < 0)
-		return ret;
-	
-	do {	
-		ret = rc632_fifo_write(handle, cur_tx_len, cur_tx_buf, 0x03);
-		if (ret < 0)
-			return ret;
-
-		if (cur_tx_buf == tx_buf) {
-			ret = rc632_reg_write(handle, RC632_REG_COMMAND,
-					      RC632_CMD_TRANSCEIVE);
-			if (ret < 0)
-				return ret;
-		}
-
-		cur_tx_buf += cur_tx_len;
-		if (cur_tx_buf < tx_buf + tx_len) {
-			u_int8_t fifo_fill;
-			ret = rc632_reg_read(handle, RC632_REG_FIFO_LENGTH,
-					     &fifo_fill);
-			if (ret < 0)
-				return ret;
-
-			cur_tx_len = 64 - fifo_fill;
-			DEBUGPCRF("refilling tx fifo with %u bytes", cur_tx_len);
-		} else
-			cur_tx_len = 0;
-
-	} while (cur_tx_len);
-
-	if (toggle == 1)
-		tcl_toggle_pcb(handle);
-
-	ret = rc632_wait_idle_timer(handle);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_read(handle, RC632_REG_FIFO_LENGTH, rx_len);
-	if (ret < 0)
-		return ret;
-
-	DEBUGPCRF("rx_len = %u\n", *rx_len);
-
-	if (*rx_len == 0) {
-		u_int8_t tmp, tmp2;
-
-		rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &tmp);
-		rc632_reg_read(handle, RC632_REG_CHANNEL_REDUNDANCY, &tmp2);
-
-		DEBUGPCRF("rx_len == 0, error_flag=0x%02x, channel_red=0x%02x",
-			  tmp, tmp2);
-
-		return -1; 
-	}
-
-	return rc632_fifo_read(handle, *rx_len, rx_buf);
-}
-
 int
 rc632_read_eeprom(struct rfid_asic_handle *handle, u_int16_t addr, u_int8_t len,
 		  u_int8_t *recvbuf)
@@ -385,1094 +106,31 @@ rc632_read_eeprom(struct rfid_asic_handle *handle, u_int16_t addr, u_int8_t len,
 	sndbuf[1] = addr >> 8;
 	sndbuf[2] = len;
 
-	ret = rc632_fifo_write(handle, 3, sndbuf, 0x03);
+	ret = opcd_rc632_fifo_write(handle, 3, sndbuf, 0x03);
 	if (ret < 0)
 		return ret;
 
-	ret = rc632_reg_write(handle, RC632_REG_COMMAND, RC632_CMD_READ_E2);
+	ret = opcd_rc632_reg_write(handle, RC632_REG_COMMAND, RC632_CMD_READ_E2);
 	if (ret < 0)
 		return ret;
 
 	/* usleep(20000); */
 
-	ret = rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &err);
+	ret = opcd_rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &err);
 	if (err & RC632_ERR_FLAG_ACCESS_ERR)
 		return -EPERM;
 	
-	ret = rc632_reg_read(handle, RC632_REG_FIFO_LENGTH, &err);
+	ret = opcd_rc632_reg_read(handle, RC632_REG_FIFO_LENGTH, &err);
 	if (err < len)
 		len = err;
 
-	ret = rc632_fifo_read(handle, len, recvbuf);
+	ret = opcd_rc632_fifo_read(handle, len, recvbuf);
 	if (ret < 0)
 		return ret;
 
 	return len;
 }
 
-static int
-rc632_calc_crc16_from(struct rfid_asic_handle *handle)
-{
-	u_int8_t sndbuf[2] = { 0x01, 0x02 };
-	u_int8_t crc_lsb = 0x00 , crc_msb = 0x00;
-	int ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CRC_PRESET_LSB, 0x12);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CRC_PRESET_MSB, 0xe0);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_fifo_write(handle, sizeof(sndbuf), sndbuf, 3);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_COMMAND, RC632_CMD_CALC_CRC);
-	if (ret < 0)
-		return ret;
-	
-	usleep(10000);	// FIXME: no checking for cmd completion?
-
-	ret = rc632_reg_read(handle, RC632_REG_CRC_RESULT_LSB, &crc_lsb);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_read(handle, RC632_REG_CRC_RESULT_MSB, &crc_msb);
-	if (ret < 0)
-		return ret;
-
-	// FIXME: what to do with crc result?
-	return ret;
-}
-
-
-int
-rc632_register_dump(struct rfid_asic_handle *handle, u_int8_t *buf)
-{
-	int ret;
-	u_int8_t i;
-
-	for (i = 0; i <= 0x3f; i++) {
-		ret = rc632_reg_read(handle, i, &buf[i]);
-		// do we want error checks?
-	}
-	return 0;
-}
-
-
-#if 0
-static int
-rc632_init(struct rfid_asic_handle *ah)
-{
-	int ret;
-
-	/* switch off rf (make sure PICCs are reset at init time) */
-	ret = rc632_power_down(ah);
-	if (ret < 0)
-		return ret;
-
-	usleep(10000);
-
-	/* switch on rf */
-	ret = rc632_power_up(ah);
-	if (ret < 0)
-		return ret;
-
-	/* disable register paging */
-	ret = rc632_reg_write(ah, 0x00, 0x00);
-	if (ret < 0)
-		return ret;
-
-	/* set some sane default values */
-	ret = rc632_reg_write(ah, 0x11, 0x5b);
-	if (ret < 0)
-		return ret;
-
-	/* switch on rf */
-	ret = rc632_turn_on_rf(ah);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
-static int
-rc632_fini(struct rfid_asic_handle *ah)
-{
-	int ret;
-
-	/* switch off rf */
-	ret = rc632_turn_off_rf(ah);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_power_down(ah);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-#endif
-
-
-/* 
- * Philips CL RC632 primitives for ISO 14443-A compliant PICC's
- *
- * (C) 2005 by Harald Welte <laforge@gnumonks.org>
- *
- */
-
-int
-rc632_iso14443a_init(struct rfid_asic_handle *handle)
-{
-	int ret;
-
-	// FIXME: some fifo work (drain fifo?)
-	
-	/* flush fifo (our way) */
-	ret = rc632_reg_write(handle, RC632_REG_CONTROL, 0x01);
-
-	ret = rc632_reg_write(handle, RC632_REG_TX_CONTROL,
-			(RC632_TXCTRL_TX1_RF_EN |
-			 RC632_TXCTRL_TX2_RF_EN |
-			 RC632_TXCTRL_TX2_INV |
-			 RC632_TXCTRL_FORCE_100_ASK |
-			 RC632_TXCTRL_MOD_SRC_INT));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CW_CONDUCTANCE,
-				OPENPCD_CW_CONDUCTANCE);
-	if (ret < 0)
-		return ret;
-
-	/* Since FORCE_100_ASK is set (cf mc073930.pdf), this line may be left out? */
-	ret = rc632_reg_write(handle, RC632_REG_MOD_CONDUCTANCE,
-				OPENPCD_MOD_CONDUCTANCE);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CODER_CONTROL,
-				(RC632_CDRCTRL_TXCD_14443A |
-				 RC632_CDRCTRL_RATE_106K));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_MOD_WIDTH, 0x13);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_MOD_WIDTH_SOF, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_TYPE_B_FRAMING, 0x00);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_RX_CONTROL1,
-			      (RC632_RXCTRL1_GAIN_35DB |
-			       RC632_RXCTRL1_ISO14443 |
-			       RC632_RXCTRL1_SUBCP_8));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_DECODER_CONTROL,
-			      (RC632_DECCTRL_MANCHESTER |
-			       RC632_DECCTRL_RXFR_14443A));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_BIT_PHASE,
-				OPENPCD_14443A_BITPHASE);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_RX_THRESHOLD,
-				OPENPCD_14443A_THRESHOLD);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_BPSK_DEM_CONTROL, 0x00);
-	if (ret < 0)
-		return ret;
-			      
-	ret = rc632_reg_write(handle, RC632_REG_RX_CONTROL2,
-			      (RC632_RXCTRL2_DECSRC_INT |
-			       RC632_RXCTRL2_CLK_Q));
-	if (ret < 0)
-		return ret;
-
-	/* Omnikey proprietary driver has 0x03, but 0x06 is the default reset value ?!? */
-	ret = rc632_reg_write(handle, RC632_REG_RX_WAIT, 0x06);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CHANNEL_REDUNDANCY,
-			      (RC632_CR_PARITY_ENABLE |
-			       RC632_CR_PARITY_ODD));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CRC_PRESET_LSB, 0x63);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CRC_PRESET_MSB, 0x63);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
-static int
-rc632_iso14443a_fini(struct iso14443a_handle *handle_14443)
-{
-
-#if 0
-	ret = rc632_turn_off_rf(handle);
-	if (ret < 0)
-		return ret;
-#endif
-
-
-	return 0;
-}
-
-
-/* issue a 14443-3 A PCD -> PICC command in a short frame, such as REQA, WUPA */
-int
-rc632_iso14443a_transceive_sf(struct rfid_asic_handle *handle,
-				u_int8_t cmd,
-		    		struct iso14443a_atqa *atqa)
-{
-	int ret;
-	u_int8_t tx_buf[1];
-	u_int8_t rx_len = 2;
-
-	DEBUGPCRF("");
-	memset(atqa, 0, sizeof(*atqa));
-
-	tx_buf[0] = cmd;
-
-	/* transfer only 7 bits of last byte in frame */
-	ret = rc632_reg_write(handle, RC632_REG_BIT_FRAMING, 0x07);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_clear_bits(handle, RC632_REG_CONTROL,
-				RC632_CONTROL_CRYPTO1_ON);
-	if (ret < 0)
-		return ret;
-
-#if 0
-	ret = rc632_reg_write(handle, RC632_REG_CHANNEL_REDUNDANCY,
-				(RC632_CR_PARITY_ENABLE |
-				 RC632_CR_PARITY_ODD));
-#else
-	ret = rc632_clear_bits(handle, RC632_REG_CHANNEL_REDUNDANCY,
-				RC632_CR_RX_CRC_ENABLE|RC632_CR_TX_CRC_ENABLE);
-				
-#endif
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_transceive(handle, tx_buf, sizeof(tx_buf),
-				(u_int8_t *)atqa, &rx_len,
-				ISO14443A_FDT_ANTICOL_LAST1, 0);
-	if (ret < 0) {
-		DEBUGPCRF("error during rc632_transceive()");
-		return ret;
-	}
-
-	/* switch back to normal 8bit last byte */
-	ret = rc632_reg_write(handle, RC632_REG_BIT_FRAMING, 0x00);
-	if (ret < 0)
-		return ret;
-
-	if (rx_len != 2) {
-		DEBUGPCRF("rx_len(%d) != 2", rx_len);
-		return -1;
-	}
-
-	return 0;
-}
-
-/* transceive regular frame */
-int
-rc632_iso14443ab_transceive(struct rfid_asic_handle *handle,
-			   unsigned int frametype,
-			   const u_int8_t *tx_buf, unsigned int tx_len,
-			   u_int8_t *rx_buf, unsigned int *rx_len,
-			   u_int64_t timeout, unsigned int flags)
-{
-	int ret;
-	u_int8_t rxl = *rx_len & 0xff;
-	u_int8_t channel_red;
-
-	DEBUGPCRF("tx_len=%u, rx_len=%u", tx_len, *rx_len);
-
-	memset(rx_buf, 0, *rx_len);
-
-	switch (frametype) {
-	case RFID_14443A_FRAME_REGULAR:
-	case RFID_MIFARE_FRAME:
-		channel_red = RC632_CR_RX_CRC_ENABLE|RC632_CR_TX_CRC_ENABLE
-				|RC632_CR_PARITY_ENABLE|RC632_CR_PARITY_ODD;
-		break;
-	case RFID_14443B_FRAME_REGULAR:
-		channel_red = RC632_CR_RX_CRC_ENABLE|RC632_CR_TX_CRC_ENABLE
-				|RC632_CR_CRC3309;
-		break;
-#if 0
-	case RFID_MIFARE_FRAME:
-		channel_red = RC632_CR_PARITY_ENABLE|RC632_CR_PARITY_ODD;
-		break;
-#endif
-	default:
-		return -EINVAL;
-		break;
-	}
-	ret = rc632_reg_write(handle, RC632_REG_CHANNEL_REDUNDANCY,
-			      channel_red);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_transceive(handle, tx_buf, tx_len, rx_buf, &rxl, timeout, 0);
-	*rx_len = rxl;
-	if (ret < 0)
-		return ret;
-
-
-	return 0; 
-}
-
-/* transceive anti collission bitframe */
-int
-rc632_iso14443a_transceive_acf(struct rfid_asic_handle *handle,
-				struct iso14443a_anticol_cmd *acf,
-				unsigned int *bit_of_col)
-{
-	int ret;
-	u_int8_t rx_buf[64];
-	u_int8_t rx_len = sizeof(rx_buf);
-	u_int8_t rx_align = 0, tx_last_bits, tx_bytes;
-	u_int8_t boc;
-	u_int8_t error_flag;
-	*bit_of_col = ISO14443A_BITOFCOL_NONE;
-	memset(rx_buf, 0, sizeof(rx_buf));
-
-	/* disable mifare cryto */
-	ret = rc632_clear_bits(handle, RC632_REG_CONTROL,
-				RC632_CONTROL_CRYPTO1_ON);
-	if (ret < 0)
-		return ret;
-
-	/* disable CRC summing */
-#if 0
-	ret = rc632_reg_write(handle, RC632_REG_CHANNEL_REDUNDANCY,
-				(RC632_CR_PARITY_ENABLE |
-				 RC632_CR_PARITY_ODD));
-#else
-	ret = rc632_clear_bits(handle, RC632_REG_CHANNEL_REDUNDANCY,
-				RC632_CR_TX_CRC_ENABLE|RC632_CR_TX_CRC_ENABLE);
-#endif
-	if (ret < 0)
-		return ret;
-
-	tx_last_bits = acf->nvb & 0x0f;	/* lower nibble indicates bits */
-	tx_bytes = acf->nvb >> 4;
-	if (tx_last_bits) {
-		tx_bytes++;
-		rx_align = (tx_last_bits+1) % 8;/* rx frame complements tx */
-	}
-
-	//rx_align = 8 - tx_last_bits;/* rx frame complements tx */
-
-	/* set RxAlign and TxLastBits*/
-	ret = rc632_reg_write(handle, RC632_REG_BIT_FRAMING,
-				(rx_align << 4) | (tx_last_bits));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_transceive(handle, (u_int8_t *)acf, tx_bytes,
-				rx_buf, &rx_len, 0x32, 0);
-	if (ret < 0)
-		return ret;
-
-	/* bitwise-OR the two halves of the split byte */
-	acf->uid_bits[tx_bytes-2] = (
-		  (acf->uid_bits[tx_bytes-2] & (0xff >> (8-tx_last_bits)))
-		| rx_buf[0]);
-	/* copy the rest */
-	memcpy(&acf->uid_bits[tx_bytes+1-2], &rx_buf[1], rx_len-1);
-
-	/* determine whether there was a collission */
-	ret = rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &error_flag);
-	if (ret < 0)
-		return ret;
-
-	if (error_flag & RC632_ERR_FLAG_COL_ERR) {
-		/* retrieve bit of collission */
-		ret = rc632_reg_read(handle, RC632_REG_COLL_POS, &boc);
-		if (ret < 0)
-			return ret;
-
-		/* bit of collission relative to start of part 1 of 
-		 * anticollision frame (!) */
-		*bit_of_col = 2*8 + boc;
-	}
-
-	return 0;
-}
-
-enum rc632_rate {
-	RC632_RATE_106	= 0x00,
-	RC632_RATE_212	= 0x01,
-	RC632_RATE_424	= 0x02,
-	RC632_RATE_848	= 0x03,
-};
-
-struct rx_config {
-	u_int8_t	subc_pulses;
-	u_int8_t	rx_coding;
-	u_int8_t	rx_threshold;
-	u_int8_t	bpsk_dem_ctrl;
-};
-
-struct tx_config {
-	u_int8_t	rate;
-	u_int8_t	mod_width;
-};
-
-static const struct rx_config rx_configs[] = {
-	{
-		.subc_pulses 	= RC632_RXCTRL1_SUBCP_8,
-		.rx_coding	= RC632_DECCTRL_MANCHESTER,
-		.rx_threshold	= 0x88,
-		.bpsk_dem_ctrl	= 0x00,
-	},
-	{
-		.subc_pulses	= RC632_RXCTRL1_SUBCP_4,
-		.rx_coding	= RC632_DECCTRL_BPSK,
-		.rx_threshold	= 0x50,
-		.bpsk_dem_ctrl	= 0x0c,
-	},
-	{
-		.subc_pulses	= RC632_RXCTRL1_SUBCP_2,
-		.rx_coding	= RC632_DECCTRL_BPSK,
-		.rx_threshold	= 0x50,
-		.bpsk_dem_ctrl	= 0x0c,
-	},
-	{
-		.subc_pulses	= RC632_RXCTRL1_SUBCP_1,
-		.rx_coding	= RC632_DECCTRL_BPSK,
-		.rx_threshold	= 0x50,
-		.bpsk_dem_ctrl	= 0x0c,
-	},
-};
-
-static const struct tx_config tx_configs[] = {
-	{
-		.rate 		= RC632_CDRCTRL_RATE_106K,
-		.mod_width	= 0x13,
-	},
-	{
-		.rate		= RC632_CDRCTRL_RATE_212K,
-		.mod_width	= 0x07,
-	},
-	{
-		.rate		= RC632_CDRCTRL_RATE_424K,
-		.mod_width	= 0x03,
-	},
-	{
-		.rate		= RC632_CDRCTRL_RATE_848K,
-		.mod_width	= 0x01,
-	},
-};
-
-int rc632_iso14443a_set_speed(struct rfid_asic_handle *handle,
-			     unsigned int tx,
-			     u_int8_t rate)
-{
-	int rc;
-	u_int8_t reg;
-
-
-	if (!tx) {
-		/* Rx */
-		if (rate > ARRAY_SIZE(rx_configs))
-			return -EINVAL;
-
-		rc = rc632_set_bit_mask(handle, RC632_REG_RX_CONTROL1,
-					RC632_RXCTRL1_SUBCP_MASK,
-					rx_configs[rate].subc_pulses);
-		if (rc < 0)
-			return rc;
-
-		rc = rc632_set_bit_mask(handle, RC632_REG_DECODER_CONTROL,
-					RC632_DECCTRL_BPSK,
-					rx_configs[rate].rx_coding);
-		if (rc < 0)
-			return rc;
-
-		rc = rc632_reg_write(handle, RC632_REG_RX_THRESHOLD,
-					rx_configs[rate].rx_threshold);
-		if (rc < 0)
-			return rc;
-
-		if (rx_configs[rate].rx_coding == RC632_DECCTRL_BPSK) {
-			rc = rc632_reg_write(handle, 
-					     RC632_REG_BPSK_DEM_CONTROL,
-					     rx_configs[rate].bpsk_dem_ctrl);
-			if (rc < 0)
-				return rc;
-		}
-	} else {
-		/* Tx */
-		if (rate > ARRAY_SIZE(tx_configs))
-			return -EINVAL;
-
-		rc = rc632_set_bit_mask(handle, RC632_REG_CODER_CONTROL,
-					RC632_CDRCTRL_RATE_MASK,
-					tx_configs[rate].rate);
-		if (rc < 0)
-			return rc;
-
-		rc = rc632_reg_write(handle, RC632_REG_MOD_WIDTH,
-				     tx_configs[rate].mod_width);
-		if (rc < 0)
-			return rc;
-	}
-
-	return 0;
-}
-
-static int rc632_iso14443b_init(struct rfid_asic_handle *handle)
-{
-	int ret;
-
-	// FIXME: some FIFO work
-	
-	/* flush fifo (our way) */
-	ret = rc632_reg_write(handle, RC632_REG_CONTROL, 0x01);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_TX_CONTROL,
-			(RC632_TXCTRL_TX1_RF_EN |
-			 RC632_TXCTRL_TX2_RF_EN |
-			 RC632_TXCTRL_TX2_INV |
-			 RC632_TXCTRL_MOD_SRC_INT));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CW_CONDUCTANCE, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_MOD_CONDUCTANCE, 0x04);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CODER_CONTROL,
-			      (RC632_CDRCTRL_TXCD_NRZ |
-			       RC632_CDRCTRL_RATE_14443B));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_MOD_WIDTH, 0x13);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_MOD_WIDTH_SOF, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_TYPE_B_FRAMING,
-			      (RC632_TBFRAMING_SOF_11L_3H |
-			       (6 << RC632_TBFRAMING_SPACE_SHIFT) |
-			       RC632_TBFRAMING_EOF_11));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_RX_CONTROL1,
-			      (RC632_RXCTRL1_GAIN_35DB |
-			       RC632_RXCTRL1_ISO14443 |
-			       RC632_RXCTRL1_SUBCP_8));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_DECODER_CONTROL,
-			      (RC632_DECCTRL_BPSK |
-			       RC632_DECCTRL_RXFR_14443B));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_BIT_PHASE,
-				OPENPCD_14443B_BITPHASE);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_RX_THRESHOLD,
-				OPENPCD_14443B_THRESHOLD);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_BPSK_DEM_CONTROL,
-			      ((0x2 & RC632_BPSKD_TAUB_MASK)<<RC632_BPSKD_TAUB_SHIFT |
-			       (0x3 & RC632_BPSKD_TAUD_MASK)<<RC632_BPSKD_TAUD_SHIFT |
-			       RC632_BPSKD_FILTER_AMP_DETECT |
-			       RC632_BPSKD_NO_RX_EOF |
-			       RC632_BPSKD_NO_RX_EGT));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_RX_CONTROL2,
-			      (RC632_RXCTRL2_AUTO_PD |
-			       RC632_RXCTRL2_DECSRC_INT));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_RX_WAIT, 0x03);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CHANNEL_REDUNDANCY,
-			      (RC632_CR_TX_CRC_ENABLE |
-			       RC632_CR_RX_CRC_ENABLE |
-			       RC632_CR_CRC3309));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CRC_PRESET_LSB, 0xff);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(handle, RC632_REG_CRC_PRESET_MSB, 0xff);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
-static int
-rc632_iso15693_init(struct rfid_asic_handle *h)
-{
-	int ret;
-
-	ret = rc632_reg_write(h, RC632_REG_TX_CONTROL,
-						(RC632_TXCTRL_MOD_SRC_INT |
-						 RC632_TXCTRL_TX2_INV |
-						 RC632_TXCTRL_TX2_RF_EN |
-						 RC632_TXCTRL_TX1_RF_EN));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CW_CONDUCTANCE, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_MOD_CONDUCTANCE, 0x03);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CODER_CONTROL,
-						(RC632_CDRCTRL_RATE_15693 |
-						 0x03)); /* FIXME */
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_MOD_WIDTH, 0x3f);
-	if (ret < 0)
-		return ret;
-	
-	ret = rc632_reg_write(h, RC632_REG_MOD_WIDTH_SOF, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_TYPE_B_FRAMING, 0x00);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_RX_CONTROL1, 
-						(RC632_RXCTRL1_SUBCP_16 |
-						 RC632_RXCTRL1_ISO15693 |
-						 RC632_RXCTRL1_GAIN_35DB));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_DECODER_CONTROL,
-						(RC632_DECCTRL_RXFR_15693 |
-						 RC632_DECCTRL_RX_INVERT));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_BIT_PHASE, 0xe0);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_RX_THRESHOLD, 0xff);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_BPSK_DEM_CONTROL, 0x00);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_RX_CONTROL2,
-						(RC632_RXCTRL2_AUTO_PD |
-						 RC632_RXCTRL2_DECSRC_INT));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CHANNEL_REDUNDANCY,
-						(RC632_CR_CRC3309 |
-						 RC632_CR_RX_CRC_ENABLE |
-						 RC632_CR_TX_CRC_ENABLE));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CRC_PRESET_LSB, 0xff);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CRC_PRESET_MSB, 0xff);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
-static int
-rc632_iso15693_icode_init(struct rfid_asic_handle *h)
-{
-	int ret;
-
-	ret = rc632_reg_write(h, RC632_REG_TX_CONTROL,
-						(RC632_TXCTRL_MOD_SRC_INT |
-						 RC632_TXCTRL_TX2_INV |
-						 RC632_TXCTRL_TX2_RF_EN |
-						 RC632_TXCTRL_TX1_RF_EN));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CW_CONDUCTANCE, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_MOD_CONDUCTANCE, 0x02);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CODER_CONTROL, 0x2c);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_MOD_WIDTH, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_MOD_WIDTH_SOF, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_MOD_WIDTH_SOF, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_TYPE_B_FRAMING, 0x00);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_RX_CONTROL1, 0x8b); /* FIXME */
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_DECODER_CONTROL, 0x00);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_BIT_PHASE, 0x52);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_RX_THRESHOLD, 0x66);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_BPSK_DEM_CONTROL, 0x00);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_RX_CONTROL2, 
-						RC632_RXCTRL2_DECSRC_INT);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CHANNEL_REDUNDANCY,
-						(RC632_CR_RX_CRC_ENABLE |
-						 RC632_CR_TX_CRC_ENABLE));
-	ret = rc632_reg_write(h, RC632_REG_CRC_PRESET_LSB, 0xfe);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CRC_PRESET_MSB, 0xff);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
-static int
-rc632_iso15693_icl_init(struct rfid_asic_handle *h)
-{
-	int ret;
-	
-	/* ICL */
-
-	ret = rc632_reg_write(h, RC632_REG_TX_CONTROL, 
-						(RC632_TXCTRL_MOD_SRC_INT |	
-						 RC632_TXCTRL_TX2_INV |
-						 RC632_TXCTRL_TX2_RF_EN |
-						 RC632_TXCTRL_TX1_RF_EN));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CW_CONDUCTANCE, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_MOD_CONDUCTANCE, 0x11);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CODER_CONTROL, 
-						(RC632_CDRCTRL_RATE_15693 |
-						 RC632_CDRCTRL_TXCD_ICODE_STD |
-						 0x03)); /* FIXME */
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_MOD_WIDTH, 0x3f);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_MOD_WIDTH_SOF, 0x3f);
-	if (ret < 0)
-		return ret;
-	ret = rc632_reg_write(h, RC632_REG_RX_CONTROL1, 
-						(RC632_RXCTRL1_SUBCP_16|
-						 RC632_RXCTRL1_ISO15693|
-						 RC632_RXCTRL1_GAIN_35DB));
-	if (ret < 0)
-		return ret;
-	ret = rc632_reg_write(h, RC632_REG_DECODER_CONTROL,
-						(RC632_DECCTRL_RX_INVERT|
-						 RC632_DECCTRL_RXFR_15693));
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_BIT_PHASE, 0xbd);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_RX_THRESHOLD, 0xff);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_BPSK_DEM_CONTROL, 0x00);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_RX_CONTROL2, 
-						RC632_RXCTRL2_DECSRC_INT);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CHANNEL_REDUNDANCY, 0x00);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CRC_PRESET_LSB, 0x12);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_CRC_PRESET_MSB, 0xe0);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
-struct mifare_authcmd {
-	u_int8_t auth_cmd;
-	u_int8_t block_address;
-	u_int32_t serno;	/* lsb 1 2 msb */
-} __attribute__ ((packed));
-
-
-#define RFID_MIFARE_KEY_LEN 6
-#define RFID_MIFARE_KEY_CODED_LEN 12
-
-/* Transform crypto1 key from generic 6byte into rc632 specific 12byte */
-static int
-rc632_mifare_transform_key(const u_int8_t *key6, u_int8_t *key12)
-{
-	int i;
-	u_int8_t ln;
-	u_int8_t hn;
-
-	for (i = 0; i < RFID_MIFARE_KEY_LEN; i++) {
-		ln = key6[i] & 0x0f;
-		hn = key6[i] >> 4;
-		key12[i * 2 + 1] = (~ln << 4) | ln;
-		key12[i * 2] = (~hn << 4) | hn;
-	}
-	return 0;
-}
-
-static int
-rc632_mifare_set_key(struct rfid_asic_handle *h, const u_int8_t *key)
-{
-	u_int8_t coded_key[RFID_MIFARE_KEY_CODED_LEN];
-	u_int8_t reg;
-	int ret;
-
-	ret = rc632_mifare_transform_key(key, coded_key);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_fifo_write(h, RFID_MIFARE_KEY_CODED_LEN, coded_key, 0x03);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_COMMAND, RC632_CMD_LOAD_KEY);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_wait_idle(h, RC632_TMO_AUTH1);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_read(h, RC632_REG_ERROR_FLAG, &reg);
-	if (ret < 0)
-		return ret;
-
-	if (reg & RC632_ERR_FLAG_KEY_ERR)
-		return -EINVAL;
-
-	return 0;
-}
-
-static int
-rc632_mifare_auth(struct rfid_asic_handle *h, u_int8_t cmd, u_int32_t serno,
-		  u_int8_t block)
-{
-	int ret;
-	struct mifare_authcmd acmd;
-	u_int8_t reg;
-
-	if (cmd != RFID_CMD_MIFARE_AUTH1A && cmd != RFID_CMD_MIFARE_AUTH1B)
-		return -EINVAL;
-
-	/* Initialize acmd */
-	acmd.block_address = block & 0xff;
-	acmd.auth_cmd = cmd;
-	//acmd.serno = htonl(serno);
-	acmd.serno = serno;
-
-	/* Clear Rx CRC */
-	ret = rc632_clear_bits(h, RC632_REG_CHANNEL_REDUNDANCY,
-				RC632_CR_RX_CRC_ENABLE);
-	if (ret < 0)
-		return ret;
-
-	/* Send Authent1 Command */
-	ret = rc632_fifo_write(h, sizeof(acmd), (unsigned char *)&acmd, 0x03);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_write(h, RC632_REG_COMMAND, RC632_CMD_AUTHENT1);
-	if (ret < 0)
-		return ret;
-
-	/* Wait until transmitter is idle */
-	ret = rc632_wait_idle(h, RC632_TMO_AUTH1);
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_reg_read(h, RC632_REG_SECONDARY_STATUS, &reg);
-	if (ret < 0)
-		return ret;
-	if (reg & 0x07)
-		return -EIO;
-
-	/* Clear Tx CRC */
-	ret = rc632_clear_bits(h, RC632_REG_CHANNEL_REDUNDANCY,
-				RC632_CR_TX_CRC_ENABLE);
-	if (ret < 0)
-		return ret;
-
-	/* Send Authent2 Command */
-	ret = rc632_reg_write(h, RC632_REG_COMMAND, RC632_CMD_AUTHENT2);
-	if (ret < 0)
-		return ret;
-
-	/* Wait until transmitter is idle */
-	ret = rc632_wait_idle(h, RC632_TMO_AUTH1);
-	if (ret < 0)
-		return ret;
-
-	/* Check whether authentication was successful */
-	ret = rc632_reg_read(h, RC632_REG_CONTROL, &reg);
-	if (ret < 0)
-		return ret;
-
-	if (!(reg & RC632_CONTROL_CRYPTO1_ON))
-		return -EACCES;
-
-	return 0;
-
-}
-
-/* transceive regular frame */
-static int
-rc632_mifare_transceive(struct rfid_asic_handle *handle,
-			const u_int8_t *tx_buf, unsigned int tx_len,
-			u_int8_t *rx_buf, unsigned int *rx_len,
-			u_int64_t timeout, unsigned int flags)
-{
-	int ret;
-	u_int8_t rxl = *rx_len & 0xff;
-
-	DEBUGP("entered\n");
-	memset(rx_buf, 0, *rx_len);
-
-#if 1
-	ret = rc632_reg_write(handle, RC632_REG_CHANNEL_REDUNDANCY,
-				(RC632_CR_PARITY_ENABLE |
-				 RC632_CR_PARITY_ODD |
-				 RC632_CR_TX_CRC_ENABLE |
-				 RC632_CR_RX_CRC_ENABLE));
-#else
-	ret = rc632_clear_bits(handle, RC632_REG_CHANNEL_REDUNDANCY,
-				RC632_CR_RX_CRC_ENABLE|RC632_CR_TX_CRC_ENABLE);
-#endif
-	if (ret < 0)
-		return ret;
-
-	ret = rc632_transceive(handle, tx_buf, tx_len, rx_buf, &rxl, 0x32, 0);
-	*rx_len = rxl;
-	if (ret < 0)
-		return ret;
-
-
-	return 0; 
-}
-
 #define RC632_E2_PRODUCT_TYPE	0
 #define RC632_E2_PRODUCT_SERIAL	8
 #define RC632_E2_RS_MAX_P	14