Nfc: switch to HAL ticks. ApiHal: small cleanup and refactoring. (#609)
This commit is contained in:
@@ -19,7 +19,6 @@ void nfc_cli_detect(Cli* cli, string_t args, void* context) {
|
||||
rfalNfcDevice* dev_list;
|
||||
uint8_t dev_cnt = 0;
|
||||
bool cmd_exit = false;
|
||||
api_hal_nfc_init();
|
||||
api_hal_nfc_exit_sleep();
|
||||
printf("Detecting nfc...\r\nPress Ctrl+C to abort\r\n");
|
||||
while(!cmd_exit) {
|
||||
@@ -51,7 +50,6 @@ void nfc_cli_emulate(Cli* cli, string_t args, void* context) {
|
||||
return;
|
||||
}
|
||||
|
||||
api_hal_nfc_init();
|
||||
api_hal_nfc_exit_sleep();
|
||||
printf("Emulating NFC-A Type: T2T UID: CF72D440 SAK: 20 ATQA: 00/04\r\n");
|
||||
printf("Press Ctrl+C to abort\r\n");
|
||||
|
@@ -15,9 +15,7 @@ NfcWorker* nfc_worker_alloc() {
|
||||
nfc_worker->callback = NULL;
|
||||
nfc_worker->context = NULL;
|
||||
// Initialize rfal
|
||||
nfc_worker->error = api_hal_nfc_init();
|
||||
if(nfc_worker->error == ERR_NONE) {
|
||||
api_hal_nfc_start_sleep();
|
||||
if(!api_hal_nfc_is_busy()) {
|
||||
nfc_worker_change_state(nfc_worker, NfcWorkerStateReady);
|
||||
} else {
|
||||
nfc_worker_change_state(nfc_worker, NfcWorkerStateBroken);
|
||||
@@ -35,10 +33,6 @@ NfcWorkerState nfc_worker_get_state(NfcWorker* nfc_worker) {
|
||||
return nfc_worker->state;
|
||||
}
|
||||
|
||||
ReturnCode nfc_worker_get_error(NfcWorker* nfc_worker) {
|
||||
return nfc_worker->error;
|
||||
}
|
||||
|
||||
void nfc_worker_start(
|
||||
NfcWorker* nfc_worker,
|
||||
NfcWorkerState state,
|
||||
|
@@ -28,8 +28,6 @@ NfcWorker* nfc_worker_alloc();
|
||||
|
||||
NfcWorkerState nfc_worker_get_state(NfcWorker* nfc_worker);
|
||||
|
||||
ReturnCode nfc_worker_get_error(NfcWorker* nfc_worker);
|
||||
|
||||
void nfc_worker_free(NfcWorker* nfc_worker);
|
||||
|
||||
void nfc_worker_start(
|
||||
|
@@ -26,7 +26,6 @@ struct NfcWorker {
|
||||
void* context;
|
||||
|
||||
NfcWorkerState state;
|
||||
ReturnCode error;
|
||||
};
|
||||
|
||||
void nfc_worker_change_state(NfcWorker* nfc_worker, NfcWorkerState state);
|
||||
|
Reference in New Issue
Block a user