Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-20 18:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

bsp: Fixes due to header file changes

Browse Source 
Update #2833.
This commit is contained in:
Sebastian Huber
2017-06-13 11:38:39 +02:00
parent 0af8bb6c37
commit 3f884b455f
3 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
c/src/lib/libbsp/powerpc/virtex/include/bsp.h
+2 -1
View File
@@ -71,7 +71,8 @@ extern bool bsp_timer_internal_clock; /* TRUE, when timer runs with CPU clk */
#include "xiltemac.h"
#define RTEMS_BSP_NETWORK_DRIVER_NAME XILTEMAC_DRIVER_PREFIX
#endif
extern xilTemac_driver_attach(struct rtems_bsdnet_ifconfig*, int );
struct rtems_bsdnet_ifconfig;
extern int xilTemac_driver_attach(struct rtems_bsdnet_ifconfig*, int );
#define RTEMS_BSP_NETWORK_DRIVER_ATTACH xilTemac_driver_attach
#ifdef __cplusplus
c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c
+16 -15
View File
@@ -19,9 +19,10 @@
#define __BSD_VISIBLE
#endif
#include <rtems.h>
#include <bsp.h>
#include <rtems/bspIo.h>
#include <rtems/rtems_bsdnet.h>
#include <inttypes.h>
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -80,7 +81,7 @@ static rtems_id gXilTxThread = 0;
static rtems_event_set gUnitSignals[ NUM_XILTEMAC_UNITS ]= { RTEMS_EVENT_1,
RTEMS_EVENT_2 };
uint32_t xilTemacTxFifoVacancyBytes(uint32_t aBaseAddr)
static uint32_t xilTemacTxFifoVacancyBytes(uint32_t aBaseAddr)
{
uint32_t ipisr = IN32(aBaseAddr + XTE_IPISR_OFFSET);
uint32_t bytes = 0;
@@ -95,7 +96,7 @@ uint32_t xilTemacTxFifoVacancyBytes(uint32_t aBaseAddr)
return bytes;
}
void xilTemacFifoRead64(uint32_t aBaseAddr, uint32_t* aBuf, uint32_t aBytes)
static void xilTemacFifoRead64(uint32_t aBaseAddr, uint32_t* aBuf, uint32_t aBytes)
{
uint32_t numqwords = aBytes / 8;
uint32_t xtrabytes = aBytes % 8;
@@ -146,7 +147,7 @@ void xilTemacFifoRead64(uint32_t aBaseAddr, uint32_t* aBuf, uint32_t aBytes)
}
}
void xilTemacFifoWrite64(uint32_t aBaseAddr, uint32_t* aBuf, uint32_t aBytes)
static void xilTemacFifoWrite64(uint32_t aBaseAddr, uint32_t* aBuf, uint32_t aBytes)
{
uint32_t numqwords = aBytes / 8;
uint32_t xtrabytes = aBytes % 8;
@@ -279,7 +280,7 @@ void xilTemacStart(struct ifnet *ifp)
/* Set the link speed */
uint32_t emcfg = IN32(base + XTE_ECFG_OFFSET);
printk("xiltemacStart, default linkspeed: %08x\n", emcfg);
printk("xiltemacStart, default linkspeed: %08" PRIx32 "\n", emcfg);
emcfg = (emcfg & ~XTE_ECFG_LINKSPD_MASK) | XTE_ECFG_LINKSPD_100;
OUT32(base + XTE_ECFG_OFFSET, emcfg);
@@ -349,7 +350,7 @@ void xilTemacStart(struct ifnet *ifp)
ipier |= (XTE_IPXR_AUTO_NEG_MASK);
OUT32(base + XTE_IPIER_OFFSET, ipier);
printk("%s: xiltemacStart, ipier: %08x\n",DRIVER_PREFIX, ipier);
printk("%s: xiltemacStart, ipier: %08" PRIx32 "\n",DRIVER_PREFIX, ipier);
/* Enable device global interrutps */
OUT32(base + XTE_DGIE_OFFSET, XTE_DGIE_ENABLE_MASK);
@@ -412,7 +413,7 @@ void xilTemacPrintStats( struct ifnet *ifp )
printf("\n");
}
void xilTemacIsrSingle(struct XilTemac* xilTemac)
static void xilTemacIsrSingle(struct XilTemac* xilTemac)
{
uint32_t base = xilTemac->iAddr;
uint32_t disr = IN32( base + XTE_DISR_OFFSET );
@@ -426,7 +427,7 @@ void xilTemacIsrSingle(struct XilTemac* xilTemac)
/* Handle all error conditions first */
if( disr & (XTE_DXR_DPTO_MASK | XTE_DXR_TERR_MASK |
XTE_DXR_RECV_FIFO_MASK | XTE_DXR_SEND_FIFO_MASK) ) {
printk("%s: Fatal Bus error, disr: %08x\n", DRIVER_PREFIX, disr);
printk("%s: Fatal Bus error, disr: %08" PRIx32 "\n", DRIVER_PREFIX, disr);
/*assert(0);*/
}
if( disr & XTE_DXR_CORE_MASK ) {
@@ -439,7 +440,7 @@ void xilTemacIsrSingle(struct XilTemac* xilTemac)
/* Check for all fatal errors, even if that error is not enabled in ipier */
if(ipisr & XTE_IPXR_FIFO_FATAL_ERROR_MASK) {
printk("%s: Fatal Fifo Error ipisr: %08x\n", DRIVER_PREFIX, ipisr);
printk("%s: Fatal Fifo Error ipisr: %08" PRIx32 "\n", DRIVER_PREFIX, ipisr);
/*assert(0);*/
}
@@ -541,12 +542,12 @@ int xilTemacIsrIsOn(const rtems_irq_connect_data *unused)
#endif
int32_t xilTemacSetMulticastFilter(struct ifnet *ifp)
static int32_t xilTemacSetMulticastFilter(struct ifnet *ifp)
{
return 0;
}
int xilTemacIoctl(struct ifnet* ifp, ioctl_command_t aCommand, caddr_t aData)
static int xilTemacIoctl(struct ifnet* ifp, ioctl_command_t aCommand, caddr_t aData)
{
struct XilTemac* xilTemac = ifp->if_softc;
int32_t error = 0;
@@ -617,7 +618,7 @@ void xilTemacSend(struct ifnet* ifp)
* cache friendly */
static unsigned char gTxBuf[2048] __attribute__ ((aligned (32)));
void xilTemacSendPacket(struct ifnet *ifp, struct mbuf* aMbuf)
static void xilTemacSendPacket(struct ifnet *ifp, struct mbuf* aMbuf)
{
struct XilTemac *xilTemac = ifp->if_softc;
struct mbuf *n = aMbuf;
@@ -660,7 +661,7 @@ void xilTemacSendPacket(struct ifnet *ifp, struct mbuf* aMbuf)
#endif
}
void xilTemacTxThreadSingle(struct ifnet* ifp)
static void xilTemacTxThreadSingle(struct ifnet* ifp)
{
struct XilTemac* xilTemac = ifp->if_softc;
struct mbuf* m;
@@ -751,7 +752,7 @@ void xilTemacTxThread( void *ignore )
}
}
void xilTemacRxThreadSingle(struct ifnet* ifp)
static void xilTemacRxThreadSingle(struct ifnet* ifp)
{
struct XilTemac* xilTemac = ifp->if_softc;
@@ -876,7 +877,7 @@ void xilTemacRxThread( void *ignore )
}
}
int32_t xilTemac_driver_attach(struct rtems_bsdnet_ifconfig* aBsdConfig, int aDummy)
int xilTemac_driver_attach(struct rtems_bsdnet_ifconfig* aBsdConfig, int aDummy)
{
struct ifnet* ifp;
int32_t mtu;
c/src/libchip/network/smc91111.c
+19 -8
View File
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <inttypes.h>
#include <rtems/error.h>
#include <rtems/rtems_bsdnet.h>
#include <rtems/irq-extension.h>
@@ -72,7 +73,9 @@ static void smc91111_start(struct ifnet *ifp);
static int smc_probe(struct lan91cxx_priv_data *cpd);
static void smc91111_stop(struct lan91cxx_priv_data *cpd);
static void smc91111_init(void *arg);
#ifndef BSP_FEATURE_IRQ_EXTENSION
static void lan91cxx_finish_sent(struct lan91cxx_priv_data *cpd);
#endif
#if 0
static int lan91cxx_phy_fixed(struct lan91cxx_priv_data *cpd);
static void lan91cxx_phy_configure(struct lan91cxx_priv_data *cpd);
@@ -81,6 +84,7 @@ static void lan91cxx_phy_configure(struct lan91cxx_priv_data *cpd);
#define min(l,r) ((l) < (r) ? (l) : (r))
#define max(l,r) ((l) > (r) ? (l) : (r))
#ifndef BSP_FEATURE_IRQ_EXTENSION
/* \ ------------- Interrupt ------------- \ */
static void lan91cxx_interrupt_handler(void *arg)
{
@@ -136,6 +140,7 @@ static void lan91cxx_interrupt_handler(void *arg)
put_reg(cpd, LAN91CXX_POINTER, oldpointer);
HAL_WRITE_UINT16(cpd->base + (LAN91CXX_BS), oldbase);
}
#endif
/* \ ------------- Rx receive ------------- \ */
@@ -440,7 +445,7 @@ static int readpacket(struct lan91cxx_priv_data *cpd)
db_printf("mbuf-chain:");
while (n) {
db_printf("[%" PRIxPTR ":%x]",
n->m_data,
mtod(n, uintptr_t),
(unsigned int)(n->m_len));
n = n->m_next;
}
@@ -706,6 +711,7 @@ static void smc91111_start(struct ifnet *ifp)
}
#ifndef BSP_FEATURE_IRQ_EXTENSION
/* called after a tx error interrupt, freet the packet */
static void lan91cxx_finish_sent(struct lan91cxx_priv_data *cpd)
{
@@ -784,6 +790,7 @@ static void lan91cxx_finish_sent(struct lan91cxx_priv_data *cpd)
put_reg(cpd, LAN91CXX_PNR, saved_packet);
}
#endif
/* \ ------------- Helpers ------------- \ */
@@ -1021,7 +1028,7 @@ static void smc91111_stop(struct lan91cxx_priv_data *cpd)
int lan91cxx_hardware_init(struct lan91cxx_priv_data *cpd)
{
unsigned short val;
int i, rc;
int i;
DEBUG_FUNCTION();
@@ -1045,11 +1052,15 @@ int lan91cxx_hardware_init(struct lan91cxx_priv_data *cpd)
}
}
#else
db_printf("Install lan91cxx isr at vec/irq %d\n", cpd->config.vector);
rc = rtems_interrupt_handler_install(cpd->config.vector, "smc91cxx",
RTEMS_INTERRUPT_SHARED, lan91cxx_interrupt_handler, cpd);
if (rc != RTEMS_SUCCESSFUL)
return 0;
{
int rc;
db_printf("Install lan91cxx isr at vec/irq %d\n", cpd->config.vector);
rc = rtems_interrupt_handler_install(cpd->config.vector, "smc91cxx",
RTEMS_INTERRUPT_SHARED, lan91cxx_interrupt_handler, cpd);
if (rc != RTEMS_SUCCESSFUL)
return 0;
}
#endif
/* Reset chip */
@@ -1235,7 +1246,7 @@ static int smc_probe(struct lan91cxx_priv_data *cpd)
/* I don't recognize this chip, so... */
db_printf
("smc_probe: IO %" PRIxPTR ": Unrecognized revision register:"
" %x, Contact author. \n", cpd->base,
" %x, Contact author. \n", (uintptr_t)cpd->base,
revision_register);
return -ENODEV;