Changeset 22f7769 in mainline for arch/ia32/src

Timestamp:

2005-10-17T23:31:41Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4b2c872d

Parents:

75eacab

Message:

Rename cpu_priority_{high|low|restore|read} functions to interrupts_{disable|enable|restore|read}.
Rename pri_t to ipl_t (Interrupt Priority Level).
Rename thread_t::pri to thread_t::priority.

Location:

arch/ia32/src

Files:

• drivers/ega.c (modified) (2 diffs)
• interrupt.c (modified) (1 diff)
• userspace.c (modified) (2 diffs)

arch/ia32/src/drivers/ega.c

@@ -81 +81 @@
 void ega_putchar(const char ch)
 {
-        pri_t pri;
+        ipl_t ipl;
 
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
         spinlock_lock(&egalock);
 
@@ -102 +102 @@
 
         spinlock_unlock(&egalock);
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
 }
 

arch/ia32/src/interrupt.c

@@ -80 +80 @@
 /*
  * Called directly from the assembler code.
- * CPU is cpu_priority_high().
+ * CPU is interrupts_disable()'d.
  */
 void trap_dispatcher(__u8 n, __native stack[])

arch/ia32/src/userspace.c

@@ -42 +42 @@
 void userspace(void)
 {
-        pri_t pri;
+        ipl_t ipl;
         
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
 
         __asm__ volatile (
@@ -61 +61 @@
                 "iret"
                 : 
-                : "i" (selector(UDATA_DES) | PL_USER), "r" (USTACK_ADDRESS+(THREAD_STACK_SIZE)), "r" (pri), "i" (selector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS)
+                : "i" (selector(UDATA_DES) | PL_USER), "r" (USTACK_ADDRESS+(THREAD_STACK_SIZE)), "r" (ipl), "i" (selector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS)
                 : "eax");