Do core interrupt masking in a less general fashion and save some instructions to decrease size and speed things up a little bit. Small fix to a few places where interrupts would get enabled again where they shouldn't have been (context switching calls when disabled).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16811 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 2 deletions

diff --git a/firmware/target/coldfire/iaudio/x5/ds2411-x5.c b/firmware/target/coldfire/iaudio/x5/ds2411-x5.c
index dc5a188ae1..a9bf20f727 100644
--- a/firmware/target/coldfire/iaudio/x5/ds2411-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/ds2411-x5.c
@@ -134,7 +134,7 @@ static unsigned char ds2411_read_byte(void)
  */
 int ds2411_read_id(struct ds2411_id *id)
 {
-    int level = set_irq_level(DISABLE_INTERRUPTS); /* Timing sensitive */
+    int level = disable_irq_save(); /* Timing sensitive */
     int i;
     unsigned char crc;
 
@@ -208,7 +208,7 @@ int ds2411_read_id(struct ds2411_id *id)
         i = DS2411_NO_PRESENCE;
     }
 
-    set_irq_level(level);
+    restore_irq(level);
 
     return i;
 } /* ds2411_read_id */