129dd97b51
`SpiNorFlash.h` is a C++ header, but the `Identification` struct is
created in a C style using `typedef struct`. Clang issues a warining
about this discrepancy:
```
In file included from /home/nero/repos/pinetime/InfiniSim/InfiniTime/src/systemtask/SystemTask.cpp:13:
/home/nero/repos/pinetime/InfiniSim/sim/drivers/SpiNorFlash.h:16:21: warning: anonymous non-C-compatible type given name for linkage purposes by typedef declaration; add a tag name here [-Wnon-c-typedef-for-linkage]
typedef struct __attribute__((packed)) {
^
Identification
/home/nero/repos/pinetime/InfiniSim/sim/drivers/SpiNorFlash.h:17:9: note: type is not C-compatible due to this default member initializer
uint8_t manufacturer = 0;
^~~~~~~~~~~~~~~~~~~~
/home/nero/repos/pinetime/InfiniSim/sim/drivers/SpiNorFlash.h:20:9: note: type is given name 'Identification' for linkage purposes by this typedef declaration
} Identification;
^
1 warning generated.
```
The easy fix is to use a C++ style struct.
Also includes code style fix from Riksu9000
Co-authored-by: Riku Isokoski <riksu9000@gmail.com>
61 lines
1.6 KiB
C++
61 lines
1.6 KiB
C++
#pragma once
|
|
#include <cstddef>
|
|
#include <cstdint>
|
|
|
|
namespace Pinetime {
|
|
namespace Drivers {
|
|
class Spi;
|
|
class SpiNorFlash {
|
|
public:
|
|
explicit SpiNorFlash(Spi& spi);
|
|
SpiNorFlash(const SpiNorFlash&) = delete;
|
|
SpiNorFlash& operator=(const SpiNorFlash&) = delete;
|
|
SpiNorFlash(SpiNorFlash&&) = delete;
|
|
SpiNorFlash& operator=(SpiNorFlash&&) = delete;
|
|
|
|
struct __attribute__((packed)) Identification {
|
|
uint8_t manufacturer = 0;
|
|
uint8_t type = 0;
|
|
uint8_t density = 0;
|
|
};
|
|
|
|
Identification ReadIdentificaion();
|
|
uint8_t ReadStatusRegister();
|
|
bool WriteInProgress();
|
|
bool WriteEnabled();
|
|
uint8_t ReadConfigurationRegister();
|
|
void Read(uint32_t address, uint8_t* buffer, size_t size);
|
|
void Write(uint32_t address, const uint8_t* buffer, size_t size);
|
|
void WriteEnable();
|
|
void SectorErase(uint32_t sectorAddress);
|
|
uint8_t ReadSecurityRegister();
|
|
bool ProgramFailed();
|
|
bool EraseFailed();
|
|
|
|
void Init();
|
|
void Uninit();
|
|
|
|
void Sleep();
|
|
void Wakeup();
|
|
|
|
private:
|
|
enum class Commands : uint8_t {
|
|
PageProgram = 0x02,
|
|
Read = 0x03,
|
|
ReadStatusRegister = 0x05,
|
|
WriteEnable = 0x06,
|
|
ReadConfigurationRegister = 0x15,
|
|
SectorErase = 0x20,
|
|
ReadSecurityRegister = 0x2B,
|
|
ReadIdentification = 0x9F,
|
|
ReleaseFromDeepPowerDown = 0xAB,
|
|
DeepPowerDown = 0xB9
|
|
};
|
|
static constexpr uint16_t pageSize = 256;
|
|
|
|
Spi& spi;
|
|
Identification device_id;
|
|
};
|
|
}
|
|
}
|