From 8110f9b08238842d3dfde69641cec009f6e44234 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 24 May 2006 13:50:40 +0000 Subject: [PATCH] Updated to REAL_CODE() --- src/arch/i386/firmware/pcbios/bios.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/arch/i386/firmware/pcbios/bios.c b/src/arch/i386/firmware/pcbios/bios.c index ebcbbc04..bcbe98a8 100644 --- a/src/arch/i386/firmware/pcbios/bios.c +++ b/src/arch/i386/firmware/pcbios/bios.c @@ -28,15 +28,10 @@ unsigned long currticks ( void ) { /* Re-enable interrupts so that the timer interrupt can occur */ - REAL_EXEC ( rm_currticks, - "sti\n\t" - "nop\n\t" - "nop\n\t" - "cli\n\t", - 0, - OUT_CONSTRAINTS (), - IN_CONSTRAINTS (), - CLOBBER ( "eax" ) ); /* can't have an empty clobber list */ + __asm__ __volatile__ ( REAL_CODE ( "sti\n\t" + "nop\n\t" + "nop\n\t" + "cli\n\t" ) : : ); get_real ( ticks, BDA_SEG, 0x006c ); get_real ( midnight, BDA_SEG, 0x0070 ); @@ -54,12 +49,7 @@ unsigned long currticks ( void ) { CPU_NAP - Save power by halting the CPU until the next interrupt **************************************************************************/ void cpu_nap ( void ) { - REAL_EXEC ( rm_cpu_nap, - "sti\n\t" - "hlt\n\t" - "cli\n\t", - 0, - OUT_CONSTRAINTS (), - IN_CONSTRAINTS (), - CLOBBER ( "eax" ) ); /* can't have an empty clobber list */ + __asm__ __volatile__ ( REAL_CODE ( "sti\n\t" + "hlt\n\t" + "cli\n\t" ) : : ); }