summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2006-05-24 15:50:40 +0200
committerMichael Brown2006-05-24 15:50:40 +0200
commit8110f9b08238842d3dfde69641cec009f6e44234 (patch)
tree48d8d6b98331e5854c7bb669e35b2c8082522588
parentUpdated to REAL_CODE(). (diff)
downloadipxe-8110f9b08238842d3dfde69641cec009f6e44234.tar.gz
ipxe-8110f9b08238842d3dfde69641cec009f6e44234.tar.xz
ipxe-8110f9b08238842d3dfde69641cec009f6e44234.zip
Updated to REAL_CODE()
-rw-r--r--src/arch/i386/firmware/pcbios/bios.c24
1 files changed, 7 insertions, 17 deletions
diff --git a/src/arch/i386/firmware/pcbios/bios.c b/src/arch/i386/firmware/pcbios/bios.c
index ebcbbc04e..bcbe98a88 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" ) : : );
}