Changeset 89128f3 in mainline for kernel/genarch/src

Timestamp:

2011-12-08T23:12:14Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9c986d3

Parents:

b25199bc (diff), c40f385 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/genarch/src

Files:

• drivers/i8042/i8042.c (modified) (7 diffs)
• fb/bfb.c (modified) (2 diffs)
• multiboot/multiboot2.c (modified) (2 diffs)

kernel/genarch/src/drivers/i8042/i8042.c

@@ -44 +44 @@
 #include <mm/slab.h>
 #include <ddi/device.h>
+#include <time/delay.h>
 
 #define i8042_SET_COMMAND  0x60
@@ -51 +52 @@
 #define i8042_BUFFER_FULL_MASK  0x01
 #define i8042_WAIT_MASK         0x02
+
+#define i8042_TIMEOUT  65536
 
 static irq_ownership_t i8042_claim(irq_t *irq)
@@ -77 +80 @@
 static void i8042_clear_buffer(i8042_t *dev)
 {
-        while (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK)
+        for (uint32_t i = 0; i < i8042_TIMEOUT; i++) {
+                if ((pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) == 0)
+                        break;
+                
                 (void) pio_read_8(&dev->data);
+                delay(50);  /* 50 us think time */
+        }
+}
+
+static void i8042_send_command(i8042_t *dev, uint8_t cmd)
+{
+        for (uint32_t i = 0; i < i8042_TIMEOUT; i++) {
+                if ((pio_read_8(&dev->status) & i8042_WAIT_MASK) == 0)
+                        break;
+                
+                delay(50);  /* 50 us think time */
+        }
+        
+        pio_write_8(&dev->status, cmd);
+        delay(10000);  /* 10 ms think time */
 }
 
@@ -84 +105 @@
 i8042_instance_t *i8042_init(i8042_t *dev, inr_t inr)
 {
-        i8042_instance_t *instance
-            = malloc(sizeof(i8042_instance_t), FRAME_ATOMIC);
+        i8042_instance_t *instance =
+            malloc(sizeof(i8042_instance_t), FRAME_ATOMIC);
         if (instance) {
                 instance->i8042 = dev;
@@ -96 +117 @@
                 instance->irq.handler = i8042_irq_handler;
                 instance->irq.instance = instance;
-                
         }
         
@@ -107 +127 @@
         ASSERT(kbrdin);
         
+        i8042_clear_buffer(instance->i8042);
+        
         instance->kbrdin = kbrdin;
         irq_register(&instance->irq);
-        i8042_clear_buffer(instance->i8042);
 }
 
@@ -116 +137 @@
 {
         interrupts_disable();
-        
         i8042_clear_buffer(dev);
-        
-        /* Reset CPU */
-        pio_write_8(&dev->status, i8042_CPU_RESET);
+        i8042_send_command(dev, i8042_CPU_RESET);
 }
 

kernel/genarch/src/fb/bfb.c

@@ -40 +40 @@
 #include <console/console.h>
 
-uintptr_t bfb_addr = (uintptr_t) -1;
+uintptr_t bfb_addr = 0;
 uint32_t bfb_width = 0;
 uint32_t bfb_height = 0;
@@ -57 +57 @@
 bool bfb_init(void)
 {
-        if ((bfb_width == 0) || (bfb_height == 0))
+        if ((bfb_addr == 0) || (bfb_width == 0) || (bfb_height == 0) ||
+            (bfb_bpp == 0) || (bfb_scanline == 0))
                 return false;
         

kernel/genarch/src/multiboot/multiboot2.c

@@ -76 +76 @@
 static void multiboot2_fbinfo(const multiboot2_fbinfo_t *fbinfo)
 {
+#ifdef CONFIG_FB
         if (fbinfo->visual == MULTIBOOT2_VISUAL_RGB) {
                 bfb_addr = fbinfo->addr;
@@ -92 +93 @@
                 bfb_blue_size = fbinfo->rgb.blue_size;
         }
+#endif
 }