Changeset da74747 in mainline for kernel/arch/sparc64

Timestamp:

2006-08-09T12:24:58Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

287920f

Parents:

e2882a7

Message:

Start reorganization of different keyboard drivers.
What seemed like a screwed i8042 chip appears to be
Zilog 8530.

The repository won't compile now. To be fixed in next commits.

Location:

kernel/arch/sparc64

Files:

• Makefile.inc (modified) (2 diffs)
• include/drivers/z8530.h (moved) (moved from kernel/arch/sparc64/include/drivers/i8042.h ) (2 diffs)
• src/console.c (modified) (1 diff)
• src/drivers/kbd.c (added)
• src/mm/page.c (modified) (2 diffs)

kernel/arch/sparc64/Makefile.inc

@@ -61 +61 @@
 CONFIG_FB = y
 
-## Compile with support for i8042 controller.
+## Compile with support for z8530 controller.
 #
 
-CONFIG_I8042 = y
-CONFIG_I8042_SUN = y
-DEFS += -DCONFIG_I8042_SUN
+CONFIG_Z8530 = y
+CONFIG_KBD_SUN = y
+DEFS += -DCONFIG_KBD_SUN
 
 ARCH_SOURCES = \
@@ -89 +89 @@
         arch/$(ARCH)/src/ddi/ddi.c \
         arch/$(ARCH)/src/drivers/tick.c \
-        arch/$(ARCH)/src/drivers/i8042.c
+        arch/$(ARCH)/src/drivers/kbd.c

kernel/arch/sparc64/include/drivers/z8530.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_sparc64_I8042_H_
-#define KERN_sparc64_I8042_H_
+#ifndef KERN_sparc64_Z8530_H_
+#define KERN_sparc64_Z8530_H_
 
 #include <arch/types.h>
@@ -46 +46 @@
 extern volatile uint8_t *kbd_virt_address;
 
-static inline void i8042_data_write(uint8_t data)
+static inline void z8530_data_write(uint8_t data)
 {
         kbd_virt_address[DATA_REG] = data;
 }
 
-static inline uint8_t i8042_data_read(void)
+static inline uint8_t z8530_data_read(void)
 {
         return kbd_virt_address[DATA_REG];
 }
 
-static inline uint8_t i8042_status_read(void)
+static inline uint8_t z8530_status_read(void)
 {
         return kbd_virt_address[STATUS_REG];
 }
 
-static inline void i8042_command_write(uint8_t command)
+static inline void z8530_command_write(uint8_t command)
 {
         kbd_virt_address[COMMAND_REG] = command;

kernel/arch/sparc64/src/console.c

@@ -54 +54 @@
 {
         stdin = NULL;
+                
+        fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height,
+                bootinfo.screen.bpp, bootinfo.screen.scanline, true);
 
         if (bootinfo.keyboard.addr)
                 kbd_init();
-                
-        fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height,
-                bootinfo.screen.bpp, bootinfo.screen.scanline, true);
 }
 

kernel/arch/sparc64/src/mm/page.c

@@ -47 +47 @@
 }
 
+/** Map memory-mapped device into virtual memory.
+ *
+ * So far, only DTLB is used to map devices into memory.
+ * Chances are that there will be only a limited amount of
+ * devices that the kernel itself needs to lock in DTLB.
+ *
+ * @param physaddr Physical address of the page where the
+ *                 device is located. Must be at least
+ *                 page-aligned.
+ * @param size Size of the device's registers. Must not
+ *             exceed 4M and must include extra space
+ *             caused by the alignment.
+ *
+ * @return Virtual address of the page where the device is
+ *         mapped.
+ */
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
@@ -69 +85 @@
         };
         
+        ASSERT(ALIGN_UP(physaddr, PAGE_SIZE) == physaddr);
         ASSERT(size <= 4*1024*1024);