Changes in / [40a2af3:05fb96b] in mainline

Location:

uspace

Files:

• drv/bus/usb/usbhid/kbd.h (deleted)
• drv/bus/usb/usbhid/kbd/layout.h (deleted)
• drv/bus/usb/usbhid/kbd/main.c (deleted)
• drv/bus/usb/usbhid/layout.h (deleted)
• drv/bus/usb/usbmast/scsi.h (deleted)
• srv/hid/console/console.c (modified) (4 diffs)
• srv/hid/fb/port/kfb.c (modified) (2 diffs)
• srv/hid/input/include/sun.h (deleted)
• srv/hid/input/port/dummy.c (deleted)
• srv/hid/input/port/sgcn.c (deleted)
• srv/hid/input/port/sun.c (deleted)
• srv/hid/input/port/z8530.c (deleted)

uspace/srv/hid/console/console.c

@@ -60 +60 @@
 #define CONSOLE_MARGIN  12
 
-#define STATE_START   110
+#define STATE_START   100
 #define STATE_TOP     8
 #define STATE_SPACE   4
@@ -368 +368 @@
 static console_t *cons_find_icon(sysarg_t x, sysarg_t y)
 {
-        sysarg_t status_start = STATE_START + (xres - 800) / 2;
+        sysarg_t status_start =
+            STATE_START + (xres - 800) / 2 + CONSOLE_MARGIN;
         
         if ((y < STATE_TOP) || (y >= STATE_TOP + STATE_HEIGHT))
@@ -379 +380 @@
                 return NULL;
         
-        if (((x - status_start) % (STATE_WIDTH + STATE_SPACE)) < STATE_SPACE)
+        if (((x - status_start) % (STATE_WIDTH + STATE_SPACE)) >= STATE_WIDTH)
                 return NULL;
         
@@ -894 +895 @@
         fb_vp_get_caps(fb_sess, console_vp, &ccaps);
         
+        mouse.x = xres / 2;
+        mouse.y = yres / 2;
         mouse.pressed = false;
         

uspace/srv/hid/fb/port/kfb.c

@@ -422 +422 @@
 {
         if (kfb.backbuf == NULL) {
-                kfb.backbuf = malloc(kfb.size);
+                kfb.backbuf =
+                    malloc(kfb.width * kfb.height * kfb.pixel_bytes);
                 if (kfb.backbuf == NULL)
                         return ENOMEM;
         }
         
-        memcpy(kfb.backbuf, kfb.addr, kfb.size);
+        for (sysarg_t y = 0; y < kfb.height; y++)
+                memcpy(kfb.backbuf + y * kfb.width * kfb.pixel_bytes,
+                    kfb.addr + FB_POS(0, y), kfb.width * kfb.pixel_bytes);
+        
         return EOK;
 }
@@ -436 +440 @@
                 return ENOENT;
         
-        memcpy(kfb.addr, kfb.backbuf, kfb.size);
+        for (sysarg_t y = 0; y < kfb.height; y++)
+                memcpy(kfb.addr + FB_POS(0, y),
+                    kfb.backbuf + y * kfb.width * kfb.pixel_bytes,
+                    kfb.width * kfb.pixel_bytes);
+        
         return EOK;
 }