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/m68k/dmv152/startup/bspstart.c | 2 +- c/src/lib/libbsp/m68k/idp/startup/bspstart.c | 2 +- c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c | 2 +- c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c | 2 +- c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c | 2 +- c/src/lib/libbsp/powerpc/mbx8xx/network/network.c | 8 ++++---- c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c index 8f4b3118b6..092f0ec44d 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c @@ -84,7 +84,7 @@ void bsp_start( void ) * yet been supported on this target. */ - m68k_enable_caching(); + rtems_cache_enable_instruction(); /* * we only use a hook to get the C library initialized. diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c index 867090700b..b8a894aed6 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c @@ -90,7 +90,7 @@ void bsp_start( void ) m68k_set_vbr( &M68Kvec ); - m68k_enable_caching(); + rtems_cache_enable_instruction(); /* * we only use a hook to get the C library initialized. diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c index 9818739c0f..3f85c637a4 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c @@ -73,7 +73,7 @@ void bsp_start( void ) (*(rtems_unsigned8 *)0xfffb0067) = 0x7f; /* make VME access round-robin */ - m68k_enable_caching(); + rtems_cache_enable_instruction(); /* * we only use a hook to get the C library initialized. diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c index f1b0dd3bb3..2b48e7b985 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c @@ -79,7 +79,7 @@ void bsp_start( void ) (*(rtems_unsigned8 *)0xfffe2001) = 0x08; /* make VME access round-robin */ - m68k_enable_caching(); + rtems_cache_enable_instruction(); /* * we only use a hook to get the C library initialized. diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c index 9306768e5c..26b66b6d00 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c @@ -139,7 +139,7 @@ void bsp_start( void ) vme_lcsr->master_configuration = 1; /* Disable D32 transfers : they don't work on my VMEbus rack */ - m68k_enable_caching(); + rtems_cache_enable_instruction(); /* * we only use a hook to get the C library initialized. 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