From ecc93152c987f7196d43b4c9d40dc4eaa5b18548 Mon Sep 17 00:00:00 2001 From: Aleksandr Kutuzov Date: Mon, 19 Oct 2020 01:55:41 +0300 Subject: [PATCH] NFC: rename to Nfc --- applications/nfc/nfc.c | 30 +++++++++++++++--------------- applications/nfc/nfc.h | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/applications/nfc/nfc.c b/applications/nfc/nfc.c index 5e3fb67e..a4f2a839 100644 --- a/applications/nfc/nfc.c +++ b/applications/nfc/nfc.c @@ -19,14 +19,14 @@ typedef enum { MessageTypeBase, -} NFCMessageType; +} NfcMessageType; typedef struct { Message base; void* data; -} NFCMessage; +} NfcMessage; -struct NFC { +struct Nfc { Dispatcher* dispatcher; Widget* widget; MenuItem* menu; @@ -45,7 +45,7 @@ struct NFC { #define EXAMPLE_NFCA_DEVICES 5 void nfc_worker_task(void* context) { - NFC* nfc = context; + Nfc* nfc = context; ReturnCode err; rfalNfcaSensRes sensRes; rfalNfcaSelRes selRes; @@ -135,7 +135,7 @@ void nfc_worker_task(void* context) { void nfc_draw_callback(CanvasApi* canvas, void* context) { assert(context); - NFC* nfc = context; + Nfc* nfc = context; dispatcher_lock(nfc->dispatcher); canvas->clear(canvas); @@ -153,7 +153,7 @@ void nfc_draw_callback(CanvasApi* canvas, void* context) { void nfc_input_callback(InputEvent* event, void* context) { assert(context); - NFC* nfc = context; + Nfc* nfc = context; if(!event->state) return; @@ -162,7 +162,7 @@ void nfc_input_callback(InputEvent* event, void* context) { void nfc_test_callback(void* context) { assert(context); - NFC* nfc = context; + Nfc* nfc = context; dispatcher_lock(nfc->dispatcher); @@ -176,27 +176,27 @@ void nfc_test_callback(void* context) { void nfc_read_callback(void* context) { assert(context); - NFC* nfc = context; + Nfc* nfc = context; (void)nfc; } void nfc_write_callback(void* context) { assert(context); - NFC* nfc = context; + Nfc* nfc = context; (void)nfc; } void nfc_bridge_callback(void* context) { assert(context); - NFC* nfc = context; + Nfc* nfc = context; (void)nfc; } -NFC* nfc_alloc() { - NFC* nfc = furi_alloc(sizeof(NFC)); +Nfc* nfc_alloc() { + Nfc* nfc = furi_alloc(sizeof(Nfc)); assert(nfc); - nfc->dispatcher = dispatcher_alloc(32, sizeof(NFCMessage)); + nfc->dispatcher = dispatcher_alloc(32, sizeof(NfcMessage)); nfc->widget = widget_alloc(); widget_draw_callback_set(nfc->widget, nfc_draw_callback, nfc); @@ -225,7 +225,7 @@ NFC* nfc_alloc() { } void nfc_task(void* p) { - NFC* nfc = nfc_alloc(); + Nfc* nfc = nfc_alloc(); GuiApi* gui = furi_take(nfc->gui_record); assert(gui); @@ -248,7 +248,7 @@ void nfc_task(void* p) { nfc->ret = rfalNfcInitialize(); rfalLowPowerModeStart(); - NFCMessage message; + NfcMessage message; while(1) { dispatcher_recieve(nfc->dispatcher, (Message*)&message); diff --git a/applications/nfc/nfc.h b/applications/nfc/nfc.h index 459f7fa9..e08be6a3 100644 --- a/applications/nfc/nfc.h +++ b/applications/nfc/nfc.h @@ -1,3 +1,3 @@ #pragma once -typedef struct NFC NFC; +typedef struct Nfc Nfc;