RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

grspw: descriptor tables no longer statically allocated

Browse Source
This commit is contained in:
javamonn
2013-12-16 13:36:18 -06:00
committed by Gedare Bloom
parent 50a50313cc
commit 2486c49285
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
c/src/lib/libbsp/sparc/shared/spw/grspw.c
View File

@@ -84,6 +84,7 @@
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#include <rtems/malloc.h>
#include <ambapp.h> #include <ambapp.h>
#include <grlib.h> #include <grlib.h>
#include <grspw.h> #include <grspw.h>
@@ -149,8 +150,6 @@ typedef struct {
#define BUFMEM_PER_LINK (SPACEWIRE_TXBUFS_NR*(SPACEWIRE_TXD_SIZE+SPACEWIRE_TXH_SIZE) + SPACEWIRE_RXBUFS_NR*SPACEWIRE_RXPCK_SIZE) #define BUFMEM_PER_LINK (SPACEWIRE_TXBUFS_NR*(SPACEWIRE_TXD_SIZE+SPACEWIRE_TXH_SIZE) + SPACEWIRE_RXBUFS_NR*SPACEWIRE_RXPCK_SIZE)
#define SPW_ALIGN(p,c) ((((unsigned int)(p))+((c)-1))&~((c)-1))
typedef struct { typedef struct {
/* configuration parameters */ /* configuration parameters */
spw_config config; spw_config config;
@@ -190,9 +189,6 @@ typedef struct {
#ifdef GRSPW_STATIC_MEM #ifdef GRSPW_STATIC_MEM
unsigned int membase, memend, mem_bdtable; unsigned int membase, memend, mem_bdtable;
#else
char _rxtable[SPACEWIRE_BDTABLE_SIZE*2];
char _txtable[SPACEWIRE_BDTABLE_SIZE*2];
#endif #endif
LEON3_SPACEWIRE_Regs_Map *regs; LEON3_SPACEWIRE_Regs_Map *regs;
@@ -1383,8 +1379,8 @@ static int grspw_hw_init(GRSPW_DEV *pDev) {
pDev->rx = (SPACEWIRE_RXBD *) pDev->mem_bdtable; pDev->rx = (SPACEWIRE_RXBD *) pDev->mem_bdtable;
pDev->tx = (SPACEWIRE_RXBD *) pDev->mem_bdtable + SPACEWIRE_BDTABLE_SIZE; pDev->tx = (SPACEWIRE_RXBD *) pDev->mem_bdtable + SPACEWIRE_BDTABLE_SIZE;
#else #else
pDev->rx = (SPACEWIRE_RXBD *) SPW_ALIGN(&pDev->_rxtable, SPACEWIRE_BDTABLE_SIZE); pDev->rx = (SPACEWIRE_RXBD *) rtems_heap_allocate_aligned_with_boundry( SPACEWIRE_BDTABLE_SIZE, 1024, 0 );
pDev->tx = (SPACEWIRE_TXBD *) SPW_ALIGN(&pDev->_txtable, SPACEWIRE_BDTABLE_SIZE); pDev->tx = (SPACEWIRE_TXBD *) rtems_heap_allocate_aligned_with_boundry( SPACEWIRE_BDTABLE_SIZE, 1024, 0 );
#endif #endif
SPACEWIRE_DBG("hw_init [minor %i]\n", pDev->minor); SPACEWIRE_DBG("hw_init [minor %i]\n", pDev->minor);
@@ -1425,6 +1421,10 @@ static void grspw_hw_reset(GRSPW_DEV *pDev)
SPW_STATUS_WRITE(pDev, SPW_STATUS_TO | SPW_STATUS_CE | SPW_STATUS_ER | SPW_STATUS_DE | SPW_STATUS_PE | SPW_STATUS_WRITE(pDev, SPW_STATUS_TO | SPW_STATUS_CE | SPW_STATUS_ER | SPW_STATUS_DE | SPW_STATUS_PE |
SPW_STATUS_WE | SPW_STATUS_IA | SPW_STATUS_EE); /*clear status*/ SPW_STATUS_WE | SPW_STATUS_IA | SPW_STATUS_EE); /*clear status*/
SPW_CTRL_WRITE(pDev, SPW_CTRL_LINKSTART); /*start link core*/ SPW_CTRL_WRITE(pDev, SPW_CTRL_LINKSTART); /*start link core*/
#ifndef GRSPW_STATIC_MEM
free(pDev->rx);
free(pDec->tx);
#endif
} }
static void grspw_hw_read_config(GRSPW_DEV *pDev) static void grspw_hw_read_config(GRSPW_DEV *pDev)