From 4362a03bc1fec5b0c1acce3129de03c15d732318 Mon Sep 17 00:00:00 2001 From: Dual Tachyon Date: Thu, 7 Sep 2023 20:15:32 +0100 Subject: [PATCH] Renamed GetRegister for consistency. --- app/aircopy.c | 2 +- app/app.c | 6 +++--- app/uart.c | 6 +++--- audio.c | 2 +- driver/bk4819.c | 32 ++++++++++++++++---------------- driver/bk4819.h | 2 +- radio.c | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/aircopy.c b/app/aircopy.c index cd47977..c7db6f6 100644 --- a/app/aircopy.c +++ b/app/aircopy.c @@ -65,7 +65,7 @@ void AIRCOPY_StorePacket(void) gFSKWriteIndex = 0; gUpdateDisplay = true; - Status = BK4819_GetRegister(BK4819_REG_0B); + Status = BK4819_ReadRegister(BK4819_REG_0B); BK4819_PrepareFSKReceive(); // Doc says bit 4 should be 1 = CRC OK, 0 = CRC FAIL, but original firmware checks for FAIL. if ((Status & 0x0010U) == 0 && g_FSK_Buffer[0] == 0xABCD && g_FSK_Buffer[35] == 0xDCBA) { diff --git a/app/app.c b/app/app.c index dbe2095..05a1899 100644 --- a/app/app.c +++ b/app/app.c @@ -473,11 +473,11 @@ void APP_CheckRadioInterrupts(void) return; } - while (BK4819_GetRegister(BK4819_REG_0C) & 1U) { + while (BK4819_ReadRegister(BK4819_REG_0C) & 1U) { uint16_t Mask; BK4819_WriteRegister(BK4819_REG_02, 0); - Mask = BK4819_GetRegister(BK4819_REG_02); + Mask = BK4819_ReadRegister(BK4819_REG_02); if (Mask & BK4819_REG_02_DTMF_5TONE_FOUND) { gDTMF_RequestPending = true; gDTMF_RecvTimeout = 5; @@ -539,7 +539,7 @@ void APP_CheckRadioInterrupts(void) uint8_t i; for (i = 0; i < 4; i++) { - g_FSK_Buffer[gFSKWriteIndex++] = BK4819_GetRegister(BK4819_REG_5F); + g_FSK_Buffer[gFSKWriteIndex++] = BK4819_ReadRegister(BK4819_REG_5F); } AIRCOPY_StorePacket(); } diff --git a/app/uart.c b/app/uart.c index 3987d79..4af7319 100644 --- a/app/uart.c +++ b/app/uart.c @@ -301,9 +301,9 @@ static void CMD_0527(void) Reply.Header.ID = 0x0528; Reply.Header.Size = sizeof(Reply.Data); - Reply.Data.RSSI = BK4819_GetRegister(BK4819_REG_67) & 0x01FF; - Reply.Data.ExNoiseIndicator = BK4819_GetRegister(BK4819_REG_65) & 0x007F; - Reply.Data.GlitchIndicator = BK4819_GetRegister(BK4819_REG_63); + Reply.Data.RSSI = BK4819_ReadRegister(BK4819_REG_67) & 0x01FF; + Reply.Data.ExNoiseIndicator = BK4819_ReadRegister(BK4819_REG_65) & 0x007F; + Reply.Data.GlitchIndicator = BK4819_ReadRegister(BK4819_REG_63); SendReply(&Reply, sizeof(Reply)); } diff --git a/audio.c b/audio.c index 39a6587..347717a 100644 --- a/audio.c +++ b/audio.c @@ -79,7 +79,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep) return; } - ToneConfig = BK4819_GetRegister(BK4819_REG_71); + ToneConfig = BK4819_ReadRegister(BK4819_REG_71); GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH); diff --git a/driver/bk4819.c b/driver/bk4819.c index 2780838..438c1e9 100644 --- a/driver/bk4819.c +++ b/driver/bk4819.c @@ -91,7 +91,7 @@ static uint16_t BK4819_ReadU16(void) return Value; } -uint16_t BK4819_GetRegister(BK4819_REGISTER_t Register) +uint16_t BK4819_ReadRegister(BK4819_REGISTER_t Register) { uint16_t Value; @@ -278,7 +278,7 @@ void BK4819_EnableVox(uint16_t VoxEnableThreshold, uint16_t VoxDisableThreshold) //else if(voxamp> 8) & 0x0F; + return (BK4819_ReadRegister(BK4819_REG_0B) >> 8) & 0x0F; } uint8_t BK4819_GetCDCSSCodeType(void) { - return (BK4819_GetRegister(BK4819_REG_0C) >> 14) & 3; + return (BK4819_ReadRegister(BK4819_REG_0C) >> 14) & 3; } uint8_t BK4819_GetCTCType(void) { - return (BK4819_GetRegister(BK4819_REG_0C) >> 10) & 3; + return (BK4819_ReadRegister(BK4819_REG_0C) >> 10) & 3; } void BK4819_SendFSKData(uint16_t *pData) @@ -850,7 +850,7 @@ void BK4819_SendFSKData(uint16_t *pData) BK4819_WriteRegister(BK4819_REG_59, 0x2868); while (Timeout) { - if (BK4819_GetRegister(BK4819_REG_0C) & 1U) { + if (BK4819_ReadRegister(BK4819_REG_0C) & 1U) { break; } SYSTEM_DelayMs(5); @@ -937,7 +937,7 @@ void BK4819_Enable_AfDac_DiscMode_TxDsp(void) void BK4819_GetVoxAmp(uint16_t *pResult) { - *pResult = BK4819_GetRegister(BK4819_REG_64) & 0x7FFF; + *pResult = BK4819_ReadRegister(BK4819_REG_64) & 0x7FFF; } void BK4819_SetScrambleFrequencyControlWord(uint32_t Frequency) diff --git a/driver/bk4819.h b/driver/bk4819.h index 2c20027..e2d1cd5 100644 --- a/driver/bk4819.h +++ b/driver/bk4819.h @@ -51,7 +51,7 @@ typedef enum BK4819_CssScanResult_t BK4819_CssScanResult_t; extern bool gRxIdleMode; void BK4819_Init(void); -uint16_t BK4819_GetRegister(BK4819_REGISTER_t Register); +uint16_t BK4819_ReadRegister(BK4819_REGISTER_t Register); void BK4819_WriteRegister(BK4819_REGISTER_t Register, uint16_t Data); void BK4819_WriteU8(uint8_t Data); void BK4819_WriteU16(uint16_t Data); diff --git a/radio.c b/radio.c index fffe299..52dd9b6 100644 --- a/radio.c +++ b/radio.c @@ -494,7 +494,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0) BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, false); while (1) { - Status = BK4819_GetRegister(BK4819_REG_0C); + Status = BK4819_ReadRegister(BK4819_REG_0C); if ((Status & 1U) == 0) { // INTERRUPT REQUEST break; }