lpcmanager

Fixed init of SPI for retain

2015-03-14, Edouard Tisserant
8bb24e830620
Parents 8914a16a2c60
Children 46839ad22942
Fixed init of SPI for retain
1 files changed, 27 insertions(+), 13 deletions(-)
  • +27 -13
    MC9target/plc_MC9_main_retain.c
    • --- a/MC9target/plc_MC9_main_retain.c Sat Mar 14 18:32:06 2015 +0100
    +++ b/MC9target/plc_MC9_main_retain.c Sat Mar 14 20:19:18 2015 +0100
    @@ -99,7 +99,6 @@
    static void SPI_init(void)
    {
    - int status;
    unsigned long ulong;
    unsigned int uint;
    @@ -190,6 +189,19 @@
    }
    printf("> (GET) DMA threshold : %d bytes \n", uint);
    +
    + /* Prepare for future write commands */
    + /* Write Command*/
    + priv.cmd[0] = 0x02;
    + /* Write Addresssse */
    + priv.cmd[1] = 0x00;
    + priv.cmd[2] = 0x00;
    +}
    +
    +int NVRAM_Done = 0;
    +
    +void NVRAM_Init(void){
    + int status;
    /* Set Sequencial access mode */
    uint8_t mbuf[] = {
    /* Mode, Sequ */
    @@ -201,21 +213,15 @@
    printf("Failed to change mode. ERR : %d\n", status);
    return;
    }
    -
    /* Read the whole NVRAM at start */
    SPI_Read(&priv.buf, NVRAM_SIZE);
    -
    - /* Prepare for future write commands */
    - /* Write Command*/
    - priv.cmd[0] = 0x02;
    - /* Write Addresssse */
    - priv.cmd[1] = 0x00;
    - priv.cmd[2] = 0x00;
    + NVRAM_Done = 1;
    }
    void RETAIN_task_proc(void *arg)
    {
    unsigned long msk = 0;
    + NVRAM_Init();
    while (!rt_event_wait(&RETAIN_Event, 1, &msk, EV_ANY, TM_INFINITE)) {
    if(rt_mutex_acquire(&RETAIN_Mutex, TM_INFINITE)) return;
    SPI_Write(&priv, CMDSIZE + actual_size + IDLEN);
    @@ -224,9 +230,8 @@
    }
    }
    -void InitRetain(void)
    +void InitRetain(void) /* TODO return error and care */
    {
    - rt_print_auto_init(1);
    retain_busy = 0;
    if(rt_event_create (&RETAIN_Event, "RETAIN_Event", 0, 0))
    return;
    @@ -237,8 +242,19 @@
    SPI_init(); /*TODO if error */
    + NVRAM_Done = 0;
    +
    if(rt_task_start(&RETAIN_task, &RETAIN_task_proc, NULL))
    return;
    +
    + int count = 1000000;
    + while(!NVRAM_Done && count--){
    + usleep(1);
    + }
    + if(!NVRAM_Done){
    + /*error*/
    + printf("NVRAM init timeout\n");
    + }
    }
    void CleanupRetain(void)
    @@ -295,7 +311,6 @@
    void Retain(unsigned int offset, unsigned int count, void *p)
    {
    - rt_printf("retain %d %d\n", offset, count);
    if(!retain_busy && offset + count < RETAIN_BUFFER_SIZE){
    /* write in RETAIN buffer at offset*/
    actual_size = offset + count;
    @@ -305,7 +320,6 @@
    void Remind(unsigned int offset, unsigned int count, void *p)
    {
    - rt_printf("remind %d %d\n", offset, count);
    if(!retain_busy && offset + count < RETAIN_BUFFER_SIZE)
    /* read at offset in RETAIN buffer */
    memcpy(p, &priv.buf.vars[offset], count);