From 5e77d12951fa5ce199fecebd56650558313c8aad Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 14 Jun 2000 20:32:44 +0000 Subject: Patch from John Cotton to correct cache routine naming to follow RTEMS package/object.method rule. This patch also eliminated calls to the obsolete routine m68k_enable_caching. --- c/src/lib/libbsp/powerpc/mbx8xx/network/network.c | 8 ++++---- c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'c/src/lib/libbsp/powerpc') diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c b/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c index aaa477282f..431737639b 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c @@ -746,7 +746,7 @@ scc_rxDaemon (void *arg) /* * Invalidate the buffer for this descriptor */ - rtems_invalidate_multiple_data_cache_lines(rxBd->buffer, rxBd->length); + rtems_cache_invalidate_multiple_data_lines(rxBd->buffer, rxBd->length); m = sc->rxMbuf[rxBdIndex]; m->m_len = m->m_pkthdr.len = rxBd->length - @@ -882,7 +882,7 @@ fec_rxDaemon (void *arg) /* * Invalidate the buffer for this descriptor */ - rtems_invalidate_multiple_data_cache_lines(rxBd->buffer, rxBd->length); + rtems_cache_invalidate_multiple_data_lines(rxBd->buffer, rxBd->length); m = sc->rxMbuf[rxBdIndex]; m->m_len = m->m_pkthdr.len = rxBd->length - @@ -1022,7 +1022,7 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m) /* * Flush the buffer for this descriptor */ - rtems_flush_multiple_data_cache_lines(txBd->buffer, txBd->length); + rtems_cache_flush_multiple_data_lines(txBd->buffer, txBd->length); sc->txMbuf[sc->txBdHead] = m; nAdded++; @@ -1150,7 +1150,7 @@ fec_sendpacket (struct ifnet *ifp, struct mbuf *m) /* * Flush the buffer for this descriptor */ - rtems_flush_multiple_data_cache_lines(txBd->buffer, txBd->length); + rtems_cache_flush_multiple_data_lines(txBd->buffer, txBd->length); sc->txMbuf[sc->txBdHead] = m; nAdded++; diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c index 2180df9b44..32061a9545 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c @@ -136,11 +136,11 @@ void bsp_start(void) * Enable instruction and data caches. Do not force writethrough mode. */ #ifdef INSTRUCTION_CACHE_ENABLE - rtems_enable_inst_cache(); + rtems_cache_enable_instruction(); #endif #ifdef DATA_CACHE_ENABLE - rtems_enable_data_cache(); + rtems_cache_enable_data(); #endif /* -- cgit v1.2.3