diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-18 08:06:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-20 07:50:37 +0200 |
| commit | 247131632173158cb2668d4e5c7464951b668067 (patch) | |
| tree | 4242eb55b8a0721d94b01357195ef9441f561d18 /c/src/lib/libbsp/m68k | |
| parent | score: Rename _ISR_Disable_without_giant() (diff) | |
| download | rtems-247131632173158cb2668d4e5c7464951b668067.tar.bz2 | |
score: Rename _ISR_Disable() and _ISR_Enable()
Rename _ISR_Disable() into _ISR_Local_disable(). Rename _ISR_Enable()
into _ISR_Local_enable(). Remove _Debug_Is_owner_of_giant().
This is a preparation to remove the Giant lock.
Update #2555.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/network/network.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c b/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c index 8e6b63ca7c..53f90876e4 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c @@ -47,7 +47,7 @@ M360AllocateBufferDescriptors (int count) * form, but this routine is probably being run as part of an * initialization sequence so the effect shouldn't be too severe. */ - _ISR_Disable (level); + _ISR_Local_disable (level); for (i = 0 ; i < sizeof(bdregions) / sizeof(bdregions[0]) ; i++) { /* * Verify that the region exists. @@ -74,7 +74,7 @@ M360AllocateBufferDescriptors (int count) break; } } - _ISR_Enable (level); + _ISR_Local_enable (level); if (bdp == NULL) rtems_panic ("Can't allocate %d buffer descriptor(s).\n", count); return bdp; diff --git a/c/src/lib/libbsp/m68k/mvme167/network/network.c b/c/src/lib/libbsp/m68k/mvme167/network/network.c index ab4ccf495c..2ab09da109 100644 --- a/c/src/lib/libbsp/m68k/mvme167/network/network.c +++ b/c/src/lib/libbsp/m68k/mvme167/network/network.c @@ -568,7 +568,7 @@ static void uti596_addCmd( pCmd->status = 0; pCmd->next = I596_NULL; - _ISR_Disable(level); + _ISR_Local_disable(level); if (uti596_softc.pCmdHead == I596_NULL) { uti596_softc.pCmdHead = uti596_softc.pCmdTail = uti596_softc.scb.pCmd = pCmd; @@ -578,12 +578,12 @@ static void uti596_addCmd( uti596_softc.scb.command = CUC_START; uti596_issueCA ( &uti596_softc, UTI596_NO_WAIT ); - _ISR_Enable(level); + _ISR_Local_enable(level); } else { uti596_softc.pCmdTail->next = (i596_cmd *) word_swap ((unsigned long)pCmd); uti596_softc.pCmdTail = pCmd; - _ISR_Enable(level); + _ISR_Local_enable(level); } #ifdef DBG_ADD_CMD @@ -1272,11 +1272,11 @@ i596_rfd * uti596_dequeue( ISR_Level level; i596_rfd * pRfd; - _ISR_Disable(level); + _ISR_Local_disable(level); /* invalid address, or empty queue or emptied queue */ if( ppQ == NULL || *ppQ == NULL || *ppQ == I596_NULL) { - _ISR_Enable(level); + _ISR_Local_enable(level); return I596_NULL; } @@ -1288,7 +1288,7 @@ i596_rfd * uti596_dequeue( *ppQ = (i596_rfd *) word_swap ((unsigned long) pRfd->next); pRfd->next = I596_NULL; /* unlink the rfd being returned */ - _ISR_Enable(level); + _ISR_Local_enable(level); return pRfd; } @@ -2083,9 +2083,9 @@ void uti596_txDaemon( UTI_596_ASSERT(pRfd != I596_NULL, "Supplying NULL RFD\n") - _ISR_Disable(level); + _ISR_Local_disable(level); uti596_supplyFD ( pRfd ); /* Return RFD to RFA. */ - _ISR_Enable(level); + _ISR_Local_enable(level); pRfd = uti596_dequeue( (i596_rfd **)&sc->pInboundFrameQueue); /* grab next frame */ |