Changes in uspace/drv/fb/kfb/port.c [7470d97:6d527cff] in mainline

File:

• uspace/drv/fb/kfb/port.c (modified) (9 diffs)

uspace/drv/fb/kfb/port.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2006 Jakub Vana
  * Copyright (c) 2006 Ondrej Palkovsky
@@ -69 +69 @@
         sysarg_t paddr;
         gfx_rect_t rect;
-        gfx_rect_t clip_rect;
         size_t offset;
         size_t scanline;
@@ -98 +97 @@
 static errno_t kfb_ddev_get_info(void *, ddev_info_t *);
 
-static errno_t kfb_gc_set_clip_rect(void *, gfx_rect_t *);
 static errno_t kfb_gc_set_color(void *, gfx_color_t *);
 static errno_t kfb_gc_fill_rect(void *, gfx_rect_t *);
@@ -113 +111 @@
 
 static gfx_context_ops_t kfb_gc_ops = {
-        .set_clip_rect = kfb_gc_set_clip_rect,
         .set_color = kfb_gc_set_color,
         .fill_rect = kfb_gc_fill_rect,
@@ -137 +134 @@
         ddev_info_init(info);
         info->rect = kfb->rect;
-        return EOK;
-}
-
-/** Set clipping rectangle on KFB.
- *
- * @param arg KFB
- * @param rect Rectangle or @c NULL
- *
- * @return EOK on success or an error code
- */
-static errno_t kfb_gc_set_clip_rect(void *arg, gfx_rect_t *rect)
-{
-        kfb_t *kfb = (kfb_t *) arg;
-
-        if (rect != NULL)
-                gfx_rect_clip(rect, &kfb->rect, &kfb->clip_rect);
-        else
-                kfb->clip_rect = kfb->rect;
-
         return EOK;
 }
@@ -383 +361 @@
 }
 
+#include <stdio.h>
 static void kfb_client_conn(ipc_call_t *icall, void *arg)
 {
@@ -393 +372 @@
         kfb = (kfb_t *) ddf_fun_data_get((ddf_fun_t *) arg);
 
+        printf("kfb_client_conn arg2=%lu arg3=%lu arg4=%lu\n",
+            (unsigned long) ipc_get_arg2(icall),
+            (unsigned long) ipc_get_arg3(icall),
+            (unsigned long) ipc_get_arg4(icall));
+
         gc_id = ipc_get_arg3(icall);
 
@@ -466 +450 @@
 
         if (!present) {
+                ddf_fun_destroy(fun);
                 rc = ENOENT;
                 goto error;
@@ -516 +501 @@
         kfb->rect.p1.x = width;
         kfb->rect.p1.y = height;
-
-        kfb->clip_rect = kfb->rect;
 
         kfb->paddr = paddr;