Skip to content

Fixed NOR extended cache size validation #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fdesbiens wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fixed NOR extended cache size validation #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions common/src/lx_nor_flash_extended_cache_enable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
* SPDX-License-Identifier: MIT
**************************************************************************/

// Some portions generated by Codex (GPT-5).


/**************************************************************************/
/**************************************************************************/
Expand Down Expand Up @@ -93,8 +95,11 @@ ULONG block_word;
#endif


/* Calculate cache size in words. */
cache_size = size / sizeof(ULONG);

/* Determine if memory was specified but with an invalid size (less than one NOR sector). */
if ((memory) && (size < LX_NOR_SECTOR_SIZE))
if ((memory) && (cache_size < LX_NOR_SECTOR_SIZE))
{

/* Error in memory size supplied. */
Expand All @@ -110,9 +115,6 @@ ULONG block_word;
/* Initialize the internal NOR cache. */
nor_flash -> lx_nor_flash_extended_cache_entries = 0;

/* Calculate cache size in words. */
cache_size = size/sizeof(ULONG);

/* Setup cache memory pointer. */
cache_memory = (ULONG *) memory;

Expand Down Expand Up @@ -317,5 +319,3 @@ ULONG block_word;
return(LX_DISABLED);
#endif
}


25 changes: 22 additions & 3 deletions test/regression/levelx_nor_flash_test_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
/* SPDX-License-Identifier: MIT */
/***************************************************************************/

// Some portions generated by Codex (GPT-5).

/* Basic NOR flash tests... */

#include <stdio.h>
Expand All @@ -31,6 +33,7 @@ ULONG readbuffer[128];

UCHAR nor_cache_memory[2048+16+8];
UCHAR nor_cache_memory2[8192];
UCHAR nor_cache_memory_invalid[256];


/* Define LevelX NOR flash simulator prototoypes. */
Expand Down Expand Up @@ -1592,7 +1595,25 @@ status += lx_nor_flash_extended_cache_enable(&nor_sim_flash, nor_cache_memory, s
/* Open the flash. */
status = lx_nor_flash_open(&nor_sim_flash, "sim nor flash", _lx_nor_flash_simulator_initialize);
#ifndef LX_NOR_DISABLE_EXTENDED_CACHE
status += lx_nor_flash_extended_cache_enable(&nor_sim_flash, nor_cache_memory2, sizeof(nor_cache_memory2));
if (status == LX_SUCCESS)
{

status = lx_nor_flash_extended_cache_enable(&nor_sim_flash, nor_cache_memory_invalid, sizeof(nor_cache_memory_invalid));

if (status != LX_ERROR)
{

printf("FAILED!\n");
#ifdef BATCH_TEST
exit(1);
#endif
while(1)
{
}
}

status = lx_nor_flash_extended_cache_enable(&nor_sim_flash, nor_cache_memory2, sizeof(nor_cache_memory2));
}
#endif

if (status != LX_SUCCESS)
Expand Down Expand Up @@ -1668,5 +1689,3 @@ status += lx_nor_flash_extended_cache_enable(&nor_sim_flash, nor_cache_memory2,
{
}
}


Loading