Changeset 0d23cc0 in mainline

Timestamp:

2013-09-11T23:51:57Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

2c9f6dd3

Parents:

3482bcc

Message:

Allow rfb parameters to be specified on the command line

Location:

uspace/srv/hid/rfb

Files:

• main.c (modified) (5 diffs)
• rfb.c (modified) (2 diffs)
• rfb.h (modified) (1 diff)

uspace/srv/hid/rfb/main.c

@@ -140 +140 @@
 static void syntax_print(void)
 {
-        fprintf(stderr, "Usage: %s <service-name> [port]\n", NAME);
+        fprintf(stderr, "Usage: %s <name> <width> <height> [port]\n", NAME);
 }
 
@@ -158 +158 @@
 int main(int argc, char **argv)
 {
-        if (argc <= 1) {
+        if (argc <= 3) {
                 syntax_print();
                 return 1;
         }
 
-        const char *service_name = argv[1];
+        const char *rfb_name = argv[1];
+        
+        char *endptr;
+        unsigned long width = strtoul(argv[2], &endptr, 0);
+        if (*endptr != 0) {
+                fprintf(stderr, "Invalid width\n");
+                syntax_print();
+                return 1;
+        }
+        
+        unsigned long height = strtoul(argv[3], &endptr, 0);
+        if (*endptr != 0) {
+                fprintf(stderr, "Invalid height\n");
+                syntax_print();
+                return 1;
+        }
+        
         unsigned long port = 5900;
-        
-        if (argc > 2) {
-                char *endptr;
-                port = strtoul(argv[2], &endptr, 0);
+        if (argc > 4) {
+                port = strtoul(argv[4], &endptr, 0);
                 if (*endptr != 0) {
                         fprintf(stderr, "Invalid port number\n");
@@ -176 +190 @@
         }
         
-        rfb_init(&rfb, 800, 600);
+        rfb_init(&rfb, width, height, rfb_name);
         
         vis = malloc(sizeof(visualizer_t));
@@ -211 +225 @@
                 printf("%s: Unable to register server.\n", NAME);
                 return rc;
-        }
+        }
+
+        char *service_name;
+        rc = asprintf(&service_name, "rfb/%s", rfb_name);
+        if (rc < 0) {
+                printf(NAME ": Unable to create service name\n");
+                return rc;
+        }
 
         service_id_t service_id;
+        
         rc = loc_service_register(service_name, &service_id);
         if (rc != EOK) {
@@ -219 +241 @@
                 return rc;
         }
+        
+        free(service_name);
 
         category_id_t visualizer_category;

uspace/srv/hid/rfb/rfb.c

@@ -161 +161 @@
 }
 
-int rfb_init(rfb_t *rfb, uint16_t width, uint16_t height)
+int rfb_init(rfb_t *rfb, uint16_t width, uint16_t height, const char *name)
 {
         memset(rfb, 0, sizeof(rfb_t));
@@ -178 +178 @@
         pf->b_shift = 16;
         
-        rfb->name = "HelenOS";
+        rfb->name = str_dup(name);
         
         return rfb_set_size(rfb, width, height);

uspace/srv/hid/rfb/rfb.h

@@ -142 +142 @@
 
 
-extern int rfb_init(rfb_t *, uint16_t, uint16_t);
+extern int rfb_init(rfb_t *, uint16_t, uint16_t, const char *);
 extern int rfb_set_size(rfb_t *, uint16_t, uint16_t);
 extern int rfb_listen(rfb_t *, uint16_t);