mirror of
https://github.com/polhenarejos/pico-keys-sdk
synced 2026-05-08 05:56:11 +02:00
Switching to new style.
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
#include <sys/mman.h>
|
||||
#include <fcntl.h>
|
||||
#define FLASH_SECTOR_SIZE 4096
|
||||
#define PICO_FLASH_SIZE_BYTES (8*1024*1024)
|
||||
#define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
|
||||
int fd_map = 0;
|
||||
uint8_t *map = NULL;
|
||||
#endif
|
||||
@@ -71,8 +71,7 @@ bool flash_available = false;
|
||||
|
||||
|
||||
//this function has to be called from the core 0
|
||||
void do_flash()
|
||||
{
|
||||
void do_flash() {
|
||||
#ifndef ENABLE_EMULATION
|
||||
if (mutex_try_enter(&mtx_flash, NULL) == true) {
|
||||
#endif
|
||||
@@ -87,8 +86,8 @@ void do_flash()
|
||||
}
|
||||
//printf("WRITTING %X\r\n",flash_pages[r].address-XIP_BASE);
|
||||
uint32_t ints = save_and_disable_interrupts();
|
||||
flash_range_erase(flash_pages[r].address-XIP_BASE, FLASH_SECTOR_SIZE);
|
||||
flash_range_program(flash_pages[r].address-XIP_BASE,
|
||||
flash_range_erase(flash_pages[r].address - XIP_BASE, FLASH_SECTOR_SIZE);
|
||||
flash_range_program(flash_pages[r].address - XIP_BASE,
|
||||
flash_pages[r].page,
|
||||
FLASH_SECTOR_SIZE);
|
||||
restore_interrupts(ints);
|
||||
@@ -101,15 +100,16 @@ void do_flash()
|
||||
#endif
|
||||
flash_pages[r].ready = false;
|
||||
ready_pages--;
|
||||
} else if (flash_pages[r].erase == true) {
|
||||
}
|
||||
else if (flash_pages[r].erase == true) {
|
||||
#ifndef ENABLE_EMULATION
|
||||
while (multicore_lockout_start_timeout_us(1000) == false) {
|
||||
;
|
||||
}
|
||||
//printf("WRITTING\r\n");
|
||||
flash_range_erase(flash_pages[r].address-XIP_BASE,
|
||||
flash_pages[r].page_size ? ((int) (flash_pages[r].page_size/
|
||||
FLASH_SECTOR_SIZE))*
|
||||
flash_range_erase(flash_pages[r].address - XIP_BASE,
|
||||
flash_pages[r].page_size ? ((int) (flash_pages[r].page_size /
|
||||
FLASH_SECTOR_SIZE)) *
|
||||
FLASH_SECTOR_SIZE : FLASH_SECTOR_SIZE);
|
||||
while (multicore_lockout_end_timeout_us(1000) == false) {
|
||||
;
|
||||
@@ -137,22 +137,20 @@ sem_release(&sem_wait);
|
||||
}
|
||||
|
||||
//this function has to be called from the core 0
|
||||
void low_flash_init()
|
||||
{
|
||||
memset(flash_pages, 0, sizeof(page_flash_t)*TOTAL_FLASH_PAGES);
|
||||
void low_flash_init() {
|
||||
memset(flash_pages, 0, sizeof(page_flash_t) * TOTAL_FLASH_PAGES);
|
||||
#ifndef ENABLE_EMULATION
|
||||
mutex_init(&mtx_flash);
|
||||
sem_init(&sem_wait, 0, 1);
|
||||
#else
|
||||
fd_map = open("memory.flash", O_RDWR | O_CREAT, (mode_t) 0600);
|
||||
lseek(fd_map, PICO_FLASH_SIZE_BYTES-1, SEEK_SET);
|
||||
lseek(fd_map, PICO_FLASH_SIZE_BYTES - 1, SEEK_SET);
|
||||
write(fd_map, "", 1);
|
||||
map = mmap(0, PICO_FLASH_SIZE_BYTES, PROT_READ | PROT_WRITE, MAP_SHARED, fd_map, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
void low_flash_init_core1()
|
||||
{
|
||||
void low_flash_init_core1() {
|
||||
#ifndef ENABLE_EMULATION
|
||||
mutex_enter_blocking(&mtx_flash);
|
||||
multicore_lockout_victim_init();
|
||||
@@ -163,8 +161,7 @@ void low_flash_init_core1()
|
||||
#endif
|
||||
}
|
||||
|
||||
void wait_flash_finish()
|
||||
{
|
||||
void wait_flash_finish() {
|
||||
#ifndef ENABLE_EMULATION
|
||||
sem_acquire_blocking(&sem_wait); //blocks until released
|
||||
//wake up
|
||||
@@ -172,8 +169,7 @@ void wait_flash_finish()
|
||||
#endif
|
||||
}
|
||||
|
||||
void low_flash_available()
|
||||
{
|
||||
void low_flash_available() {
|
||||
#ifndef ENABLE_EMULATION
|
||||
mutex_enter_blocking(&mtx_flash);
|
||||
#endif
|
||||
@@ -183,8 +179,7 @@ void low_flash_available()
|
||||
#endif
|
||||
}
|
||||
|
||||
page_flash_t *find_free_page(uintptr_t addr)
|
||||
{
|
||||
page_flash_t *find_free_page(uintptr_t addr) {
|
||||
uintptr_t addr_alg = addr & -FLASH_SECTOR_SIZE;
|
||||
page_flash_t *p = NULL;
|
||||
for (int r = 0; r < TOTAL_FLASH_PAGES; r++) {
|
||||
@@ -197,7 +192,7 @@ page_flash_t *find_free_page(uintptr_t addr)
|
||||
#else
|
||||
memcpy(p->page,
|
||||
(addr >= start_data_pool &&
|
||||
addr <= end_rom_pool) ? (uint8_t *) (map+addr_alg) : (uint8_t *) addr_alg,
|
||||
addr <= end_rom_pool) ? (uint8_t *) (map + addr_alg) : (uint8_t *) addr_alg,
|
||||
FLASH_SECTOR_SIZE);
|
||||
#endif
|
||||
ready_pages++;
|
||||
@@ -210,8 +205,7 @@ page_flash_t *find_free_page(uintptr_t addr)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int flash_program_block(uintptr_t addr, const uint8_t *data, size_t len)
|
||||
{
|
||||
int flash_program_block(uintptr_t addr, const uint8_t *data, size_t len) {
|
||||
page_flash_t *p = NULL;
|
||||
|
||||
if (!data || len == 0) {
|
||||
@@ -235,7 +229,7 @@ int flash_program_block(uintptr_t addr, const uint8_t *data, size_t len)
|
||||
printf("ERROR: FLASH CANNOT FIND A PAGE (rare error)\r\n");
|
||||
return CCID_ERR_MEMORY_FATAL;
|
||||
}
|
||||
memcpy(&p->page[addr&(FLASH_SECTOR_SIZE-1)], data, len);
|
||||
memcpy(&p->page[addr & (FLASH_SECTOR_SIZE - 1)], data, len);
|
||||
//printf("Flash: modified page %X with data %x at [%x] (top page %X)\r\n",addr_alg,data,addr&(FLASH_SECTOR_SIZE-1),addr);
|
||||
#ifndef ENABLE_EMULATION
|
||||
mutex_exit(&mtx_flash);
|
||||
@@ -243,23 +237,19 @@ int flash_program_block(uintptr_t addr, const uint8_t *data, size_t len)
|
||||
return CCID_OK;
|
||||
}
|
||||
|
||||
int flash_program_halfword(uintptr_t addr, uint16_t data)
|
||||
{
|
||||
int flash_program_halfword(uintptr_t addr, uint16_t data) {
|
||||
return flash_program_block(addr, (const uint8_t *) &data, sizeof(uint16_t));
|
||||
}
|
||||
|
||||
int flash_program_word(uintptr_t addr, uint32_t data)
|
||||
{
|
||||
int flash_program_word(uintptr_t addr, uint32_t data) {
|
||||
return flash_program_block(addr, (const uint8_t *) &data, sizeof(uint32_t));
|
||||
}
|
||||
|
||||
int flash_program_uintptr(uintptr_t addr, uintptr_t data)
|
||||
{
|
||||
int flash_program_uintptr(uintptr_t addr, uintptr_t data) {
|
||||
return flash_program_block(addr, (const uint8_t *) &data, sizeof(uintptr_t));
|
||||
}
|
||||
|
||||
uint8_t *flash_read(uintptr_t addr)
|
||||
{
|
||||
uint8_t *flash_read(uintptr_t addr) {
|
||||
uintptr_t addr_alg = addr & -FLASH_SECTOR_SIZE;
|
||||
#ifndef ENABLE_EMULATION
|
||||
mutex_enter_blocking(&mtx_flash);
|
||||
@@ -267,7 +257,7 @@ uint8_t *flash_read(uintptr_t addr)
|
||||
if (ready_pages > 0) {
|
||||
for (int r = 0; r < TOTAL_FLASH_PAGES; r++) {
|
||||
if (flash_pages[r].ready && flash_pages[r].address == addr_alg) {
|
||||
uint8_t *v = &flash_pages[r].page[addr&(FLASH_SECTOR_SIZE-1)];
|
||||
uint8_t *v = &flash_pages[r].page[addr & (FLASH_SECTOR_SIZE - 1)];
|
||||
#ifndef ENABLE_EMULATION
|
||||
mutex_exit(&mtx_flash);
|
||||
#endif
|
||||
@@ -286,31 +276,27 @@ uint8_t *flash_read(uintptr_t addr)
|
||||
return v;
|
||||
}
|
||||
|
||||
uintptr_t flash_read_uintptr(uintptr_t addr)
|
||||
{
|
||||
uintptr_t flash_read_uintptr(uintptr_t addr) {
|
||||
uint8_t *p = flash_read(addr);
|
||||
uintptr_t v = 0x0;
|
||||
for (int i = 0; i < sizeof(uintptr_t); i++) {
|
||||
v |= (uintptr_t) p[i]<<(8*i);
|
||||
v |= (uintptr_t) p[i] << (8 * i);
|
||||
}
|
||||
return v;
|
||||
}
|
||||
uint16_t flash_read_uint16(uintptr_t addr)
|
||||
{
|
||||
uint16_t flash_read_uint16(uintptr_t addr) {
|
||||
uint8_t *p = flash_read(addr);
|
||||
uint16_t v = 0x0;
|
||||
for (int i = 0; i < sizeof(uint16_t); i++) {
|
||||
v |= p[i]<<(8*i);
|
||||
v |= p[i] << (8 * i);
|
||||
}
|
||||
return v;
|
||||
}
|
||||
uint8_t flash_read_uint8(uintptr_t addr)
|
||||
{
|
||||
uint8_t flash_read_uint8(uintptr_t addr) {
|
||||
return *flash_read(addr);
|
||||
}
|
||||
|
||||
int flash_erase_page(uintptr_t addr, size_t page_size)
|
||||
{
|
||||
int flash_erase_page(uintptr_t addr, size_t page_size) {
|
||||
page_flash_t *p = NULL;
|
||||
|
||||
#ifndef ENABLE_EMULATION
|
||||
@@ -340,8 +326,7 @@ int flash_erase_page(uintptr_t addr, size_t page_size)
|
||||
return CCID_OK;
|
||||
}
|
||||
|
||||
bool flash_check_blank(const uint8_t *p_start, size_t size)
|
||||
{
|
||||
bool flash_check_blank(const uint8_t *p_start, size_t size) {
|
||||
const uint8_t *p;
|
||||
|
||||
for (p = p_start; p < p_start + size; p++) {
|
||||
|
||||
Reference in New Issue
Block a user