Changeset b412168 in mainline for uspace/app/vlaunch/vlaunch.c

Timestamp:

2014-11-17T03:25:04Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6069061

Parents:

ef3da5a (diff), 5042706 (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

File:

• uspace/app/vlaunch/vlaunch.c (modified) (4 diffs)

uspace/app/vlaunch/vlaunch.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <malloc.h>
-#include <io/pixel.h>
 #include <task.h>
-#include <str.h>
 #include <str_error.h>
-#include <loc.h>
-#include <fibril_synch.h>
-#include <io/pixel.h>
-#include <device/led_dev.h>
 
 #include <window.h>
@@ -64 +58 @@
 #define LOGO_HEIGHT  66
 
-#define PERIOD  1000000
-#define COLORS  7
-
 static char *winreg = NULL;
-static fibril_timer_t *timer = NULL;
-static list_t led_devs;
-
-static pixel_t colors[COLORS] = {
-        PIXEL(0xff, 0xff, 0x00, 0x00),
-        PIXEL(0xff, 0x00, 0xff, 0x00),
-        PIXEL(0xff, 0x00, 0x00, 0xff),
-        PIXEL(0xff, 0xff, 0xff, 0x00),
-        PIXEL(0xff, 0xff, 0x00, 0xff),
-        PIXEL(0xff, 0x00, 0xff, 0xff),
-        PIXEL(0xff, 0xff, 0xff, 0xff)
-};
-
-static unsigned int color = 0;
-
-typedef struct {
-        link_t link;
-        service_id_t svc_id;
-        async_sess_t *sess;
-} led_dev_t;
 
 static int app_launch(const char *app)
@@ -129 +100 @@
 }
 
-static void timer_callback(void *data)
-{
-        pixel_t next_color = colors[color];
-        
-        color++;
-        if (color >= COLORS)
-                color = 0;
-        
-        list_foreach(led_devs, link, led_dev_t, dev) {
-                if (dev->sess)
-                        led_dev_color_set(dev->sess, next_color);
-        }
-        
-        fibril_timer_set(timer, PERIOD, timer_callback, NULL);
-}
-
-static void loc_callback(void)
-{
-        category_id_t led_cat;
-        int rc = loc_category_get_id("led", &led_cat, IPC_FLAG_BLOCKING);
-        if (rc != EOK)
-                return;
-        
-        service_id_t *svcs;
-        size_t count;
-        rc = loc_category_get_svcs(led_cat, &svcs, &count);
-        if (rc != EOK)
-                return;
-        
-        for (size_t i = 0; i < count; i++) {
-                bool known = false;
-                
-                /* Determine whether we already know this device. */
-                list_foreach(led_devs, link, led_dev_t, dev) {
-                        if (dev->svc_id == svcs[i]) {
-                                known = true;
-                                break;
-                        }
-                }
-                
-                if (!known) {
-                        led_dev_t *dev = (led_dev_t *) calloc(1, sizeof(led_dev_t));
-                        if (!dev)
-                                continue;
-                        
-                        link_initialize(&dev->link);
-                        dev->svc_id = svcs[i];
-                        dev->sess = loc_service_connect(EXCHANGE_SERIALIZE, svcs[i], 0);
-                        
-                        list_append(&dev->link, &led_devs);
-                }
-        }
-        
-        // FIXME: Handle LED device removal
-        
-        free(svcs);
-}
-
 int main(int argc, char *argv[])
 {
         if (argc < 2) {
                 printf("Compositor server not specified.\n");
-                return 1;
-        }
-        
-        list_initialize(&led_devs);
-        int rc = loc_register_cat_change_cb(loc_callback);
-        if (rc != EOK) {
-                printf("Unable to register callback for device discovery.\n");
-                return 1;
-        }
-        
-        timer = fibril_timer_create(NULL);
-        if (!timer) {
-                printf("Unable to create timer.\n");
                 return 1;
         }
@@ -262 +162 @@
         window_exec(main_window);
         
-        fibril_timer_set(timer, PERIOD, timer_callback, NULL);
-        
         task_retval(0);
         async_manager();