Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-08 17:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Logger: cope with rename of AP_Logger_JEDEC driver

Browse Source
This commit is contained in:
Peter Barker 2024-02-26 12:55:44 +11:00 committed by Peter Barker
parent 8555a5ddbe
commit 6f4ab028ca
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Logger/AP_Logger.cpp
View File

@ -5,7 +5,7 @@
#include "AP_Logger_Backend.h" #include "AP_Logger_Backend.h"
#include "AP_Logger_File.h" #include "AP_Logger_File.h"
#include "AP_Logger_DataFlash.h" #include "AP_Logger_Flash_JEDEC.h"
#include "AP_Logger_W25N01GV.h" #include "AP_Logger_W25N01GV.h"
#include "AP_Logger_MAVLink.h" #include "AP_Logger_MAVLink.h"
@ -36,7 +36,7 @@ extern const AP_HAL::HAL& hal;
#endif #endif
#ifndef HAL_LOGGING_DATAFLASH_DRIVER #ifndef HAL_LOGGING_DATAFLASH_DRIVER
#define HAL_LOGGING_DATAFLASH_DRIVER AP_Logger_DataFlash #define HAL_LOGGING_DATAFLASH_DRIVER AP_Logger_Flash_JEDEC
#endif #endif
#ifndef HAL_LOGGING_STACK_SIZE #ifndef HAL_LOGGING_STACK_SIZE

30
libraries/AP_Logger/AP_Logger_Flash_JEDEC.cpp
View File

@ -8,7 +8,7 @@
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include "AP_Logger_DataFlash.h" #include "AP_Logger_Flash_JEDEC.h"
#include <stdio.h> #include <stdio.h>
@ -57,7 +57,7 @@ extern const AP_HAL::HAL& hal;
#define JEDEC_ID_WINBOND_W25Q128_2 0xEF7018 #define JEDEC_ID_WINBOND_W25Q128_2 0xEF7018
#define JEDEC_ID_CYPRESS_S25FL128L 0x016018 #define JEDEC_ID_CYPRESS_S25FL128L 0x016018
void AP_Logger_DataFlash::Init() void AP_Logger_Flash_JEDEC::Init()
{ {
dev = hal.spi->get_device("dataflash"); dev = hal.spi->get_device("dataflash");
if (!dev) { if (!dev) {
@ -86,7 +86,7 @@ void AP_Logger_DataFlash::Init()
/* /*
wait for busy flag to be cleared wait for busy flag to be cleared
*/ */
void AP_Logger_DataFlash::WaitReady() void AP_Logger_Flash_JEDEC::WaitReady()
{ {
if (flash_died) { if (flash_died) {
return; return;
@ -103,7 +103,7 @@ void AP_Logger_DataFlash::WaitReady()
} }
} }
bool AP_Logger_DataFlash::getSectorCount(void) bool AP_Logger_Flash_JEDEC::getSectorCount(void)
{ {
WaitReady(); WaitReady();
@ -171,7 +171,7 @@ bool AP_Logger_DataFlash::getSectorCount(void)
} }
// Read the status register // Read the status register
uint8_t AP_Logger_DataFlash::ReadStatusReg() uint8_t AP_Logger_Flash_JEDEC::ReadStatusReg()
{ {
WITH_SEMAPHORE(dev_sem); WITH_SEMAPHORE(dev_sem);
uint8_t cmd = JEDEC_READ_STATUS; uint8_t cmd = JEDEC_READ_STATUS;
@ -180,12 +180,12 @@ uint8_t AP_Logger_DataFlash::ReadStatusReg()
return status; return status;
} }
bool AP_Logger_DataFlash::Busy() bool AP_Logger_Flash_JEDEC::Busy()
{ {
return (ReadStatusReg() & (JEDEC_STATUS_BUSY | JEDEC_STATUS_SRP0)) != 0; return (ReadStatusReg() & (JEDEC_STATUS_BUSY | JEDEC_STATUS_SRP0)) != 0;
} }
void AP_Logger_DataFlash::Enter4ByteAddressMode(void) void AP_Logger_Flash_JEDEC::Enter4ByteAddressMode(void)
{ {
WITH_SEMAPHORE(dev_sem); WITH_SEMAPHORE(dev_sem);
@ -196,7 +196,7 @@ void AP_Logger_DataFlash::Enter4ByteAddressMode(void)
/* /*
send a command with an address send a command with an address
*/ */
void AP_Logger_DataFlash::send_command_addr(uint8_t command, uint32_t PageAdr) void AP_Logger_Flash_JEDEC::send_command_addr(uint8_t command, uint32_t PageAdr)
{ {
uint8_t cmd[5]; uint8_t cmd[5];
cmd[0] = command; cmd[0] = command;
@ -215,7 +215,7 @@ void AP_Logger_DataFlash::send_command_addr(uint8_t command, uint32_t PageAdr)
} }
void AP_Logger_DataFlash::PageToBuffer(uint32_t pageNum) void AP_Logger_Flash_JEDEC::PageToBuffer(uint32_t pageNum)
{ {
if (pageNum == 0 || pageNum > df_NumPages+1) { if (pageNum == 0 || pageNum > df_NumPages+1) {
printf("Invalid page read %u\n", pageNum); printf("Invalid page read %u\n", pageNum);
@ -244,7 +244,7 @@ void AP_Logger_DataFlash::PageToBuffer(uint32_t pageNum)
read_cache_valid = true; read_cache_valid = true;
} }
void AP_Logger_DataFlash::BufferToPage(uint32_t pageNum) void AP_Logger_Flash_JEDEC::BufferToPage(uint32_t pageNum)
{ {
if (pageNum == 0 || pageNum > df_NumPages+1) { if (pageNum == 0 || pageNum > df_NumPages+1) {
printf("Invalid page write %u\n", pageNum); printf("Invalid page write %u\n", pageNum);
@ -271,7 +271,7 @@ void AP_Logger_DataFlash::BufferToPage(uint32_t pageNum)
/* /*
erase one sector (sizes varies with hw) erase one sector (sizes varies with hw)
*/ */
void AP_Logger_DataFlash::SectorErase(uint32_t blockNum) void AP_Logger_Flash_JEDEC::SectorErase(uint32_t blockNum)
{ {
WriteEnable(); WriteEnable();
@ -284,7 +284,7 @@ void AP_Logger_DataFlash::SectorErase(uint32_t blockNum)
/* /*
erase one 4k sector erase one 4k sector
*/ */
void AP_Logger_DataFlash::Sector4kErase(uint32_t sectorNum) void AP_Logger_Flash_JEDEC::Sector4kErase(uint32_t sectorNum)
{ {
WriteEnable(); WriteEnable();
@ -293,7 +293,7 @@ void AP_Logger_DataFlash::Sector4kErase(uint32_t sectorNum)
send_command_addr(JEDEC_SECTOR4_ERASE, SectorAddr); send_command_addr(JEDEC_SECTOR4_ERASE, SectorAddr);
} }
void AP_Logger_DataFlash::StartErase() void AP_Logger_Flash_JEDEC::StartErase()
{ {
WriteEnable(); WriteEnable();
@ -306,7 +306,7 @@ void AP_Logger_DataFlash::StartErase()
printf("Dataflash: erase started\n"); printf("Dataflash: erase started\n");
} }
bool AP_Logger_DataFlash::InErase() bool AP_Logger_Flash_JEDEC::InErase()
{ {
if (erase_start_ms && !Busy()) { if (erase_start_ms && !Busy()) {
printf("Dataflash: erase done (%u ms)\n", AP_HAL::millis() - erase_start_ms); printf("Dataflash: erase done (%u ms)\n", AP_HAL::millis() - erase_start_ms);
@ -315,7 +315,7 @@ bool AP_Logger_DataFlash::InErase()
return erase_start_ms != 0; return erase_start_ms != 0;
} }
void AP_Logger_DataFlash::WriteEnable(void) void AP_Logger_Flash_JEDEC::WriteEnable(void)
{ {
WaitReady(); WaitReady();
WITH_SEMAPHORE(dev_sem); WITH_SEMAPHORE(dev_sem);

6
libraries/AP_Logger/AP_Logger_Flash_JEDEC.h
View File

@ -9,13 +9,13 @@
#if HAL_LOGGING_DATAFLASH_ENABLED #if HAL_LOGGING_DATAFLASH_ENABLED
class AP_Logger_DataFlash : public AP_Logger_Block { class AP_Logger_Flash_JEDEC : public AP_Logger_Block {
public: public:
AP_Logger_DataFlash(AP_Logger &front, LoggerMessageWriter_DFLogStart *writer) : AP_Logger_Flash_JEDEC(AP_Logger &front, LoggerMessageWriter_DFLogStart *writer) :
AP_Logger_Block(front, writer) {} AP_Logger_Block(front, writer) {}
static AP_Logger_Backend *probe(AP_Logger &front, static AP_Logger_Backend *probe(AP_Logger &front,
LoggerMessageWriter_DFLogStart *ls) { LoggerMessageWriter_DFLogStart *ls) {
return new AP_Logger_DataFlash(front, ls); return new AP_Logger_Flash_JEDEC(front, ls);
} }
void Init(void) override; void Init(void) override;
bool CardInserted() const override { return !flash_died && df_NumPages > 0; } bool CardInserted() const override { return !flash_died && df_NumPages > 0; }