Changeset dc747e3 in mainline for arch/ia32

Timestamp:

2005-12-15T10:27:59Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7dd2561

Parents:

3fc03fd

Message:

Add SPINLOCK_DECLARE and SPINLOCK_INITIALIZE macros.
SPINLOCK_DECLARE is to be used instead of direct spinlock_t declarations
in dynamically allocated structures on which spinlock_initialize() is called after
their creation.
SPINLOCK_INITIALIZE is to be used instead of direct spinlock_t declarations
of global spinlocks. It declares and initializes the spinlock.
Moreover, both macros are empty on UP so that -Wall warnings about unused structures
get supressed.

Location:

arch/ia32/src

Files:

• drivers/ega.c (modified) (1 diff)
• drivers/i8042.c (modified) (2 diffs)
• mm/page.c (modified) (1 diff)

arch/ia32/src/drivers/ega.c

@@ -43 +43 @@
  */
 
-static spinlock_t egalock;
+SPINLOCK_INITIALIZE(egalock);
 static __u32 ega_cursor;
 

arch/ia32/src/drivers/i8042.c

@@ -64 +64 @@
 #define LOCKED_CAPSLOCK         (1<<0)
 
-static spinlock_t keylock;              /**< keylock protects keyflags and lockflags. */
+SPINLOCK_INITIALIZE(keylock);           /**< keylock protects keyflags and lockflags. */
 static volatile int keyflags;           /**< Tracking of multiple keypresses. */
 static volatile int lockflags;          /**< Tracking of multiple keys lockings. */
@@ -244 +244 @@
         exc_register(VECTOR_KBD, "i8042_interrupt", i8042_interrupt);
         trap_virtual_enable_irqs(1<<IRQ_KBD);
-        spinlock_initialize(&keylock, "i8042_lock");
         chardev_initialize("i8042_kbd", &kbrd, &ops);
         stdin = &kbrd;

arch/ia32/src/mm/page.c

@@ -36 +36 @@
 #include <arch/interrupt.h>
 #include <arch/asm.h>
-#include <synch/spinlock.h>
 #include <debug.h>
 #include <memstr.h>