Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preparing to get rid of timer interrupt routines in fatfs module

Browse Source
This commit is contained in:
Markus Fröschle
2012-12-10 13:54:17 +00:00
parent dcb83a7ab8
commit f3e23f4923
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SD_CARD/BaS_gcc/include/sysinit.h
View File

@@ -28,8 +28,7 @@
#ifndef __SYSINIT_H__ #ifndef __SYSINIT_H__
#define __SYSINIT_H__ #define __SYSINIT_H__
#include <bas_types.h> #include <bas_types.h>
#include <wait.h>
extern inline bool waitfor(uint32_t us, int (*condition)(void));
/* adresses where FPGA data lives in flash */ /* adresses where FPGA data lives in flash */
#define FPGA_FLASH_DATA ((uint8_t *) 0xe0700000L) #define FPGA_FLASH_DATA ((uint8_t *) 0xe0700000L)

2
SD_CARD/BaS_gcc/include/wait.h
View File

@@ -30,7 +30,7 @@
#include <bas_types.h> #include <bas_types.h>
extern inline void wait(uint32_t us); extern inline void wait(uint32_t us);
extern inline bool waitfor(uint32_t us, int (*condition)(void)); extern inline uint32_t waitfor(uint32_t us, uint32_t (*condition)(void));
#endif /* _WAIT_H_ */ #endif /* _WAIT_H_ */

4
SD_CARD/BaS_gcc/sources/BaS.c
View File

@@ -52,7 +52,7 @@ extern uint8_t _EMUTOS_SIZE[];
/* /*
* check if it is possible to transfer data to PIC * check if it is possible to transfer data to PIC
*/ */
static inline bool pic_txready(void) static inline uint32_t pic_txready(void)
{ {
if (MCF_PSC3_PSCSR & MCF_PSC_PSCSR_TXRDY) if (MCF_PSC3_PSCSR & MCF_PSC_PSCSR_TXRDY)
return TRUE; return TRUE;
@@ -63,7 +63,7 @@ static inline bool pic_txready(void)
/* /*
* check if it is possible to receive data from PIC * check if it is possible to receive data from PIC
*/ */
static inline bool pic_rxready(void) static inline uint32_t pic_rxready(void)
{ {
if (MCF_PSC3_PSCSR & MCF_PSC_PSCSR_RXRDY) if (MCF_PSC3_PSCSR & MCF_PSC_PSCSR_RXRDY)
return TRUE; return TRUE;

4
SD_CARD/BaS_gcc/sources/mmcbb.c
View File

@@ -157,7 +157,7 @@ static void xmit_spi_multi(const uint8_t *buff, uint32_t btx)
#endif #endif
static int card_ready(void) static uint32_t card_ready(void)
{ {
uint8_t d; uint8_t d;
@@ -231,7 +231,7 @@ static void power_on (void) /* Enable SSP module and attach it to I/O pads */
#endif #endif
CS_HIGH(); /* Set CS# high */ CS_HIGH(); /* Set CS# high */
#endif /* _NOT_USED_ */ #endif /* _NOT_USED_ */
for (Timer1 = 10; Timer1; ) ; /* 10ms */ wait(10 * 1000); /* 10ms */
} }

4
SD_CARD/BaS_gcc/sources/sysinit.c
View File

@@ -495,7 +495,7 @@ void test_upd720101(void)
xprintf("finished\r\n"); xprintf("finished\r\n");
} }
static bool i2c_transfer_finished(void) static uint32_t i2c_transfer_finished(void)
{ {
if (MCF_I2C_I2SR & MCF_I2C_I2SR_IIF) if (MCF_I2C_I2SR & MCF_I2C_I2SR_IIF)
return TRUE; return TRUE;
@@ -509,7 +509,7 @@ static void wait_i2c_transfer_finished(void)
MCF_I2C_I2SR &= ~MCF_I2C_I2SR_IIF; /* clear interrupt bit (byte transfer finished */ MCF_I2C_I2SR &= ~MCF_I2C_I2SR_IIF; /* clear interrupt bit (byte transfer finished */
} }
static bool i2c_bus_free(void) static uint32_t i2c_bus_free(void)
{ {
return (MCF_I2C_I2SR & MCF_I2C_I2SR_IBB); return (MCF_I2C_I2SR & MCF_I2C_I2SR_IBB);
} }

9
SD_CARD/BaS_gcc/sources/wait.c
View File

@@ -45,14 +45,15 @@ inline void wait(uint32_t us)
* the same as above, with a checker function which gets called while * the same as above, with a checker function which gets called while
* busy waiting and allows for an early return if it returns true * busy waiting and allows for an early return if it returns true
*/ */
inline bool waitfor(uint32_t us, int (*condition)(void)) inline uint32_t waitfor(uint32_t us, uint32_t (*condition)(void))
{ {
uint32_t target = MCF_SLT_SCNT(0) - (us * 132); uint32_t target = MCF_SLT_SCNT(0) - (us * 132);
uint32_t res;
do do
{ {
if ((*condition)()) if ((res = (*condition)()))
return TRUE; return res;
} while (MCF_SLT_SCNT(0) > target); } while (MCF_SLT_SCNT(0) > target);
return FALSE; return 0;
} }