From e645fa30fe913cdfab52a4f48a30c6596e4291cf Mon Sep 17 00:00:00 2001 From: liang_mike Date: Thu, 4 Sep 2008 17:20:59 +0000 Subject: [PATCH] Some calls to underlying STM25 sector layer use cookie addresses, instead of the "real" addresses --- tos/chips/stm25p/Stm25pLogP.nc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tos/chips/stm25p/Stm25pLogP.nc b/tos/chips/stm25p/Stm25pLogP.nc index 12019b56..35c1cb70 100644 --- a/tos/chips/stm25p/Stm25pLogP.nc +++ b/tos/chips/stm25p/Stm25pLogP.nc @@ -201,7 +201,7 @@ implementation { uint8_t calcSector( uint8_t client, stm25p_addr_t addr ) { uint8_t sector = call Sector.getNumSectors[ client ](); - return (uint8_t)( addr >> STM25P_SECTOR_SIZE_LOG2 ) % sector; + return (uint8_t)(( addr >> STM25P_SECTOR_SIZE_LOG2 ) % sector); } stm25p_addr_t calcAddr( uint8_t client, stm25p_addr_t addr ) { @@ -342,7 +342,7 @@ implementation { else { log_info->write_addr += sizeof( m_addr ); m_rw_state = S_SEARCH_RECORDS; - call Sector.read[ id ]( log_info->write_addr, &m_header, + call Sector.read[ id ]( calcAddr(id, log_info->write_addr), &m_header, sizeof( m_header ) ); } } @@ -373,7 +373,7 @@ implementation { log_info->read_addr += sizeof( m_header ) + m_header; // if not yet at cookie, keep searching if ( log_info->read_addr < m_log_state[ id ].cookie ) { - call Sector.read[ id ]( log_info->read_addr, &m_header, + call Sector.read[ id ]( calcAddr(id, log_info->read_addr), &m_header, sizeof( m_header ) ); } // at or passed cookie, stop -- 2.39.2