Changeset 6ac14a70 in mainline for uspace/srv

Timestamp:

2009-07-28T12:47:31Z (16 years ago)

Author:

Vineeth Pillai <vineethrp@…>

Branches:

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

Children:

5e73815

Parents:

7038f55

Message:

ARM port for development board integratorcp(ARM926EJ core module).

Location:

uspace/srv

Files:

• fb/fb.c (modified) (3 diffs)
• kbd/Makefile (modified) (2 diffs)
• kbd/ctl/pl050.c (added)
• kbd/port/pl050.c (added)

uspace/srv/fb/fb.c

@@ -251 +251 @@
 }
 
+static void rgb_8880(void *dst, uint32_t rgb)
+{
+        *((uint32_t *) dst)
+            = (RED(rgb, 8) << 24) | (GREEN(rgb, 8) << 16) | BLUE(rgb, 8) << 8;
+}
+
+static void mask_8880(void *dst, bool mask)
+{
+        *((uint32_t *) dst) = (mask ? 0xffffff00 : 0);
+}
 
 /** RGB 8:8:8 conversion
@@ -651 +661 @@
                 break;
         case VISUAL_RGB_8_8_8_0:
-                screen.rgb_conv = rgb_888;
-                screen.mask_conv = mask_888;
+                screen.rgb_conv = rgb_8880;
+                screen.mask_conv = mask_8880;
                 screen.pixelbytes = 4;
                 break;
@@ -1745 +1755 @@
         unsigned int fb_scanline = sysinfo_value("fb.scanline");
         unsigned int fb_visual = sysinfo_value("fb.visual");
-        
+
         unsigned int fbsize = fb_scanline * fb_height;
         void *fb_addr = as_get_mappable_page(fbsize);
-        
+
         if (physmem_map(fb_ph_addr + fb_offset, fb_addr,
             ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
                 return -1;
-        
+
         if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual))
                 return 0;
-        
+
         return -1;
 }

uspace/srv/kbd/Makefile

@@ -62 +62 @@
 
 ifeq ($(UARCH), arm32)
+ifeq ($(MACHINE), testarm)
         GENARCH_SOURCES += \
                 port/gxemul.c
@@ -72 +73 @@
                         ctl/stty.c
         endif
+endif
+ifeq ($(MACHINE), integratorcp)
+         GENARCH_SOURCES += \
+                port/pl050.c \
+                ctl/pl050.c
+endif
 endif