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

2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* libchip/display/disp_hcms29xx.c: Initialize softc_ptr to NULL.
	* libchip/network/dec21140.c, libchip/network/if_dc.c: Use uint32_t.
This commit is contained in:
Joel Sherrill
2008-08-19 20:02:37 +00:00
parent 14afc13ade
commit cc4c524bd4
4 changed files with 114 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com>
* libchip/display/disp_hcms29xx.c: Initialize softc_ptr to NULL.
* libchip/network/dec21140.c, libchip/network/if_dc.c: Use uint32_t.
2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com>
* libchip/display/disp_hcms29xx.c: Do not make these static. They

6
c/src/libchip/display/disp_hcms29xx.c
View File

@@ -749,7 +749,7 @@ rtems_device_driver disp_hcms29xx_dev_initialize
{
rtems_status_code rc = RTEMS_SUCCESSFUL;
static char *devname = {"/dev/disp"};
disp_hcms29xx_drv_t *softc_ptr;
disp_hcms29xx_drv_t *softc_ptr = NULL;
/*
* FIXME: get softc_ptr
*/
@@ -834,7 +834,7 @@ rtems_device_driver disp_hcms29xx_dev_open
| rtems_status_code |
\*=========================================================================*/
{
disp_hcms29xx_drv_t *softc_ptr;
disp_hcms29xx_drv_t *softc_ptr = NULL;
/*
* FIXME: get softc_ptr
*/
@@ -868,7 +868,7 @@ rtems_device_driver disp_hcms29xx_dev_write
{
rtems_libio_rw_args_t *args = arg;
uint32_t cnt;
disp_hcms29xx_drv_t *softc_ptr;
disp_hcms29xx_drv_t *softc_ptr = NULL;
/*
* FIXME: get softc_ptr
*/

18
c/src/libchip/network/dec21140.c
View File

@@ -257,7 +257,7 @@ struct dec21140_softc {
int TxSuspended;
unsigned int port;
volatile unsigned int *base;
volatile uint32_t *base;
/*
* Statistics
@@ -303,7 +303,7 @@ static rtems_id txDaemonTid;
#define EE_READ_CMD (6 << 6)
#define EE_ERASE_CMD (7 << 6)
static int eeget16(volatile unsigned int *ioaddr, int location)
static int eeget16(volatile uint32_t *ioaddr, int location)
{
int i;
unsigned short retval = 0;
@@ -397,7 +397,7 @@ static void
dec21140Enet_initialize_hardware (struct dec21140_softc *sc)
{
int i,st;
volatile unsigned int *tbase;
volatile uint32_t *tbase;
volatile unsigned char *cp, *setup_frm, *eaddrs;
volatile unsigned char *buffer;
volatile struct MD *rmd;
@@ -554,7 +554,7 @@ dec21140Enet_initialize_hardware (struct dec21140_softc *sc)
static void
dec21140_rxDaemon (void *arg)
{
volatile unsigned int *tbase;
volatile uint32_t *tbase;
volatile struct MD *rmd;
struct dec21140_softc *sc;
struct ifnet *ifp;
@@ -626,7 +626,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
volatile unsigned char *temp;
struct mbuf *n;
unsigned int len;
volatile unsigned int *tbase;
volatile uint32_t *tbase;
tbase = dp->base;
/*
@@ -729,7 +729,7 @@ dec21140_init (void *arg)
{
struct dec21140_softc *sc = arg;
struct ifnet *ifp = &sc->arpcom.ac_if;
volatile unsigned int *tbase;
volatile uint32_t *tbase;
/*
* Set up DEC21140 hardware if its not already been done
@@ -745,7 +745,7 @@ dec21140_init (void *arg)
tbase = sc->base;
st_le32( (tbase+memCSR5), IT_SETUP);
st_le32( (tbase+memCSR7), IT_SETUP);
st_le32( (unsigned int*)(tbase+memCSR6), CSR6_INIT | CSR6_TXRX);
st_le32( (tbase+memCSR6), CSR6_INIT | CSR6_TXRX);
/*
* Tell the world that we're running.
@@ -759,7 +759,7 @@ dec21140_init (void *arg)
static void
dec21140_stop (struct dec21140_softc *sc)
{
volatile unsigned int *tbase;
volatile uint32_t *tbase;
struct ifnet *ifp = &sc->arpcom.ac_if;
ifp->if_flags &= ~IFF_RUNNING;
@@ -974,7 +974,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
DEC_REGISTER_SIZE ,
PTE_CACHE_DISABLE | PTE_WRITABLE);
else
sc->base = (unsigned int *)(value & ~MEM_MASK);
sc->base = (uint32_t *)(value & ~MEM_MASK);
pci_read_config_byte(pbus, pdev, pfun, 60, &interrupt);
cvalue = interrupt;

8
c/src/libchip/network/if_dc.c
View File

@@ -1604,7 +1604,7 @@ static
struct dc_type *dc_devtype( int unitnum )
{
struct dc_type *t;
unsigned int rev;
uint32_t rev;
int rc;
@@ -1908,13 +1908,13 @@ rtems_dc_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
char *unitName;
int unitNumber;
unsigned int command;
uint32_t command;
struct dc_softc *sc;
struct ifnet *ifp;
struct dc_type *t;
unsigned int revision;
uint32_t revision;
int error = 0, mac_offset;
unsigned int value;
uint32_t value;
/*
* Get the instance number for the board we're going to configure