Skip to content

Commit

Permalink
nfc/dnfc/bbio modes refactoring cleanup(remove redundant code, added …
Browse files Browse the repository at this point in the history 
…hydranfc_v2_common.c/.h)
  • Loading branch information
@bvernoux
bvernoux committed Jul 4, 2021
1 parent c95239c commit 77ea467
Show file tree
Hide file tree
Showing 9 changed files with 349 additions and 1,059 deletions.
4 changes: 2 additions & 2 deletions src/hydranfc_v2/hydranfc_v2.mk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# List of all the hydranfc related files.
HYDRANFC_V2_SRC = hydranfc_v2/hydranfc_v2_nfc_mode.c \
HYDRANFC_V2_SRC = hydranfc_v2/hydranfc_v2_common.c \
hydranfc_v2/hydranfc_v2_nfc_mode.c \
hydranfc_v2/hydranfc_v2_dnfc_mode.c \
hydranfc_v2/hydranfc_v2_ce.c \
hydranfc_v2/ce.c \
Expand All @@ -8,6 +9,5 @@ HYDRANFC_V2_SRC = hydranfc_v2/hydranfc_v2_nfc_mode.c \
hydranfc_v2/hydranfc_v2_reader.c \
hydranfc_v2/hydranfc_v2_bbio_card_emulator.c


# Required include directories
HYDRANFC_V2_INC = ./hydranfc_v2
159 changes: 16 additions & 143 deletions src/hydranfc_v2/hydranfc_v2_bbio_card_emulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* HydraBus/HydraNFC
*
* Copyright (C) 2020 Guillaume VINET
* Copyright (C) 2014-2020 Benjamin VERNOUX
* Copyright (C) 2014-2021 Benjamin VERNOUX
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,11 +19,10 @@

#include "common.h"
#include "tokenline.h"
#include "hydranfc_v2_nfc_mode.h"
#include "rfal_rf.h"
#include "hydrabus_bbio.h"
#include "bsp_gpio.h"
#include "hydranfc_v2_bbio_card_emulator.h"

#include "st25r3916.h"
#include "st25r3916_irq.h"
#include "st25r3916_com.h"
Expand All @@ -41,6 +40,10 @@
#include "bsp_print_dbg.h"
#include <string.h>

#include "hydranfc_v2_common.h"
#include "hydranfc_v2_nfc_mode.h"
#include "hydranfc_v2_bbio_card_emulator.h"

enum cardEmulationCommand {
CARDEMULATION_CMD_START = 0x01, /*!< start listen mode. */
CARDEMULATION_CMD_STOP = 0x02, /*!< stop listen mode. */
Expand All @@ -55,11 +58,6 @@ enum cardEmulationCommand {
CARDEMULATION_CMD_GET_LISTEN_STATE = 0x21,
};

static volatile int irq_count;
static volatile int irq;
static volatile int irq_end_rx;
static void (*st25r3916_irq_fn)(void) = NULL;

#define TX_BUF_LENGTH (256+3)
static uint8_t txBuf_ce[TX_BUF_LENGTH] __attribute__ ((section(".cmm")));

Expand Down Expand Up @@ -421,134 +419,9 @@ static void ce_set_cardA_activated_ptr(void *ptr) {
cardA_activated_ptr = ptr;
}

/* Triggered when the Ext IRQ is pressed or released. */
static void extcb1(void *arg) {
(void) arg;

if (st25r3916_irq_fn != NULL)
st25r3916_irq_fn();

irq_count++;
irq = 1;
}

extern t_mode_config mode_con1;
static t_hydra_console *g_con;

static ReturnCode hydranfc_v2_init_RFAL(t_hydra_console *con) {
ReturnCode err;
/* RFAL initalisation */
rfalAnalogConfigInitialize();
err = rfalInitialize();
if (err != ERR_NONE) {
cprintf(con, "hydranfc_v2_init_RFAL rfalInitialize() error=%d\r\n", err);
return err;
}

/* DPO setup */
#ifdef DPO_ENABLE
rfalDpoInitialize();
rfalDpoSetMeasureCallback( rfalChipMeasureAmplitude );
err = rfalDpoTableWrite(dpoSetup,sizeof(dpoSetup)/sizeof(rfalDpoEntry));
if(err != ERR_NONE) {
cprintf(con, "hydranfc_v2_init_RFAL rfalDpoTableWrite() error=%d\r\n", err);
return err;
}
rfalDpoSetEnabled(true);
rfalSetPreTxRxCallback(&rfalPreTransceiveCb);
#endif
return err;
}

static bool init_gpio_spi_nfc(t_hydra_console *con) {
/*
* Initializes the SPI driver 2. The SPI2 signals are routed as follow:
* ST25R3916 IO4_CS SPI mode / HydraBus PC1 - NSS
* ST25R3916 DATA_CLK SPI mode / HydraBus PB10 - SCK
* ST25R3916 IO6_MISO SPI mode / HydraBus PC2 - MISO
* ST25R3916 IO7_MOSI SPI mode / HydraBus PC3 - MOSI
* Used for communication with ST25R3916 in SPI mode with NSS.
*/
mode_con1.proto.config.spi.dev_gpio_pull = MODE_CONFIG_DEV_GPIO_NOPULL;
//mode_con1.proto.config.spi.dev_speed = 5; /* 5 250 000 Hz */
mode_con1.proto.config.spi.dev_speed = 6; /* 10 500 000 Hz */
mode_con1.proto.config.spi.dev_phase = 1;
mode_con1.proto.config.spi.dev_polarity = 0;
mode_con1.proto.config.spi.dev_bit_lsb_msb = DEV_FIRSTBIT_MSB;
mode_con1.proto.config.spi.dev_mode = DEV_MASTER;
bsp_spi_init(BSP_DEV_SPI2, &mode_con1.proto);

/*
* Initializes the SPI driver 1. The SPI1 signals are routed as follows:
* Shall be configured as SPI Slave for ST25R3916 NFC data sampling on MOD pin.
* NSS. (Not used use Software).
* ST25R3916 MCU_CLK pin28 output / HydraBus PA5 - SCK.(AF5) => SPI Slave CLK input (Sniffer mode/RX Transparent Mode)
* ST25R3916 ST25R3916 MOSI SPI pin31 (IN) / HydraBus PA6 - MISO.(AF5) (MCU TX Transparent Mode)
* ST25R3916 ST25R3916 MISO_SDA pin32 (OUT) / HydraBus PA7 - MOSI.(AF5) => SPI Slave MOSI input (Sniffer mode/RX Transparent Mode)
*/
/* spiStart() is done in sniffer see sniffer.c */
/* HydraBus SPI1 Slave CLK input */
bsp_gpio_init(BSP_GPIO_PORTA, 5, MODE_CONFIG_DEV_GPIO_IN, MODE_CONFIG_DEV_GPIO_NOPULL);
/* HydraBus SPI1 Slave MISO. Not used/Not connected */
bsp_gpio_init(BSP_GPIO_PORTA, 6, MODE_CONFIG_DEV_GPIO_IN, MODE_CONFIG_DEV_GPIO_NOPULL);
/* HydraBus SPI1 Slave MOSI. connected to ST25R3916 MOD Pin */
bsp_gpio_init(BSP_GPIO_PORTA, 7, MODE_CONFIG_DEV_GPIO_IN, MODE_CONFIG_DEV_GPIO_NOPULL);

/* Configure K1/2 Buttons as Input */
bsp_gpio_init(BSP_GPIO_PORTB, 8, MODE_CONFIG_DEV_GPIO_IN, MODE_CONFIG_DEV_GPIO_NOPULL); /* K1 Button */
bsp_gpio_init(BSP_GPIO_PORTB, 9, MODE_CONFIG_DEV_GPIO_IN, MODE_CONFIG_DEV_GPIO_NOPULL); /* K2 Button */

/* Configure D1/2/3/4 LEDs as Output */
D1_OFF;
D2_OFF;
D3_OFF;
D4_OFF;

/* LED_D1 or TST_PÏN */
bsp_gpio_init(BSP_GPIO_PORTB, 0, MODE_CONFIG_DEV_GPIO_OUT_PUSHPULL, MODE_CONFIG_DEV_GPIO_NOPULL);

#ifndef MAKE_DEBUG
// can't use LED on PB3 if using SWO
bsp_gpio_init(BSP_GPIO_PORTB, 3, MODE_CONFIG_DEV_GPIO_OUT_PUSHPULL, MODE_CONFIG_DEV_GPIO_NOPULL);
#endif

bsp_gpio_init(BSP_GPIO_PORTB, 4, MODE_CONFIG_DEV_GPIO_OUT_PUSHPULL, MODE_CONFIG_DEV_GPIO_NOPULL);
bsp_gpio_init(BSP_GPIO_PORTB, 5, MODE_CONFIG_DEV_GPIO_OUT_PUSHPULL, MODE_CONFIG_DEV_GPIO_NOPULL);

palDisablePadEvent(GPIOA, 1);
/* ST25R3916 IRQ output / HydraBus PA1 input */
palClearPad(GPIOA, 1);
palSetPadMode(GPIOA, 1, PAL_MODE_INPUT|PAL_STM32_OSPEED_MID1);
/* Activates the PAL driver callback */
//palDisablePadEvent(GPIOA, 1);
palEnablePadEvent(GPIOA, 1, PAL_EVENT_MODE_RISING_EDGE);
palSetPadCallback(GPIOA, 1, &extcb1, NULL);

/* Init st25r3916 IRQ function callback */
st25r3916_irq_fn = st25r3916Isr;
hal_st25r3916_spiInit(ST25R391X_SPI_DEVICE);
if (hydranfc_v2_init_RFAL(con) != ERR_NONE) {
cprintf(con, "HydraNFC v2 not found.\r\n");
return FALSE;
}
return TRUE;
}

static void deinit_gpio_spi_nfc(t_hydra_console *con) {
(void) (con);
palClearPad(GPIOA, 1);
palSetPadMode(GPIOA, 1, PAL_MODE_INPUT);
palDisablePadEvent(GPIOA, 1);

bsp_spi_deinit(BSP_DEV_SPI2);

bsp_gpio_init(BSP_GPIO_PORTA, 5, MODE_CONFIG_DEV_GPIO_IN, MODE_CONFIG_DEV_GPIO_NOPULL);
bsp_gpio_init(BSP_GPIO_PORTA, 6, MODE_CONFIG_DEV_GPIO_IN, MODE_CONFIG_DEV_GPIO_NOPULL);
bsp_gpio_init(BSP_GPIO_PORTA, 7, MODE_CONFIG_DEV_GPIO_IN, MODE_CONFIG_DEV_GPIO_NOPULL);

st25r3916_irq_fn = NULL;
}

static void bbio_mode_id(t_hydra_console *con) {
cprint(con, BBIO_HYDRANFC_CARD_EMULATOR, 4);
}
Expand Down Expand Up @@ -606,7 +479,7 @@ void bbio_mode_hydranfc_v2_card_emulator(t_hydra_console *con) {
uint8_t bbio_subcommand, clen;
uint8_t *rx_data = (uint8_t *) g_sbuf + 4096;

init_gpio_spi_nfc(con);
hydranfc_v2_init(con, NULL);

bbio_mode_id(con);
init();
Expand All @@ -616,8 +489,8 @@ void bbio_mode_hydranfc_v2_card_emulator(t_hydra_console *con) {
if (chnRead(con->sdu, &bbio_subcommand, 1) == 1) {
switch (bbio_subcommand) {
case BBIO_NFC_CE_START_EMULATION:
/* Init st25r3916 IRQ function callback */
st25r3916_irq_fn = st25r3916Isr;
/* Set st25r3916 IRQ function callback */
hydranfc_v2_set_irq(st25r3916Isr);

hydranfc_ce_set_processCmd_ptr(&bbio_processCmd);
ce_set_cardA_activated_ptr(&cardA_activated);
Expand All @@ -628,13 +501,13 @@ void bbio_mode_hydranfc_v2_card_emulator(t_hydra_console *con) {
bbio_subcommand = BBIO_NFC_CE_END_EMULATION;
cprint(con, (char *) &bbio_subcommand, 1);

irq_count = 0;
st25r3916_irq_fn = NULL;
/* Reset st25r3916 IRQ function callback */
hydranfc_v2_set_irq(NULL);
break;

case BBIO_NFC_CE_START_EMULATION_RAW:
/* Init st25r3916 IRQ function callback */
st25r3916_irq_fn = st25r3916Isr;
/* Set st25r3916 IRQ function callback */
hydranfc_v2_set_irq(st25r3916Isr);

hydranfc_ce_set_processCmd_ptr(&bbio_processCmd);
ce_set_cardA_activated_ptr(&cardA_activated);
Expand All @@ -645,8 +518,8 @@ void bbio_mode_hydranfc_v2_card_emulator(t_hydra_console *con) {
bbio_subcommand = BBIO_NFC_CE_END_EMULATION;
cprint(con, (char *) &bbio_subcommand, 1);

irq_count = 0;
st25r3916_irq_fn = NULL;
/* Reset st25r3916 IRQ function callback */
hydranfc_v2_set_irq(NULL);
break;

case BBIO_NFC_CE_SET_UID: {
Expand Down Expand Up @@ -694,7 +567,7 @@ void bbio_mode_hydranfc_v2_card_emulator(t_hydra_console *con) {
}

case BBIO_RESET: {
deinit_gpio_spi_nfc(con);
hydranfc_v2_cleanup(con);
return;
}
}
Expand Down

0 comments on commit 77ea467

Please sign in to comment.