Changeset 85d2fe2e in mainline for uspace/app

Timestamp:

2012-04-07T16:37:05Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

089385e8

Parents:

ec351c3 (diff), 6bb169b5 (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

Location:

uspace/app

Files:

• getterm/Makefile (modified) (1 diff)
• getterm/version.c (modified) (2 diffs)
• sportdmp/sportdmp.c (modified) (5 diffs)
• tester/hw/serial/serial1.c (modified) (5 diffs)
• websrv/websrv.c (modified) (1 diff)

uspace/app/getterm/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-DEFS = -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
+DEFS = -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)"
 BINARY = getterm
 

uspace/app/getterm/version.c

@@ -40 +40 @@
 #include "version.h"
 
+static const char *copyright = STRING(COPYRIGHT);
 static const char *release = STRING(RELEASE);
 static const char *name = STRING(NAME);
@@ -61 +62 @@
         printf("HelenOS release %s (%s)%s%s\n", release, name, revision, timestamp);
         printf("Running on %s (%s)\n", arch, term);
-        printf("Copyright (c) 2001-2011 HelenOS project\n\n");
+        printf("%s\n\n", copyright);
 }
 

uspace/app/sportdmp/sportdmp.c

@@ -27 +27 @@
  */
 
+#include <device/char_dev.h>
 #include <errno.h>
+#include <ipc/serial_ctl.h>
+#include <loc.h>
 #include <stdio.h>
-#include <devman.h>
-#include <ipc/devman.h>
-#include <device/char_dev.h>
-#include <ipc/serial_ctl.h>
 
 #define BUF_SIZE 1
 
-static void syntax_print() {
-        fprintf(stderr, "Usage: sportdmp <baud> <device_path>\n");
+static void syntax_print(void)
+{
+        fprintf(stderr, "Usage: sportdmp <baud> <device_service>\n");
 }
 
 int main(int argc, char **argv)
 {
-        const char* devpath = "/hw/pci0/00:01.0/com1/a";
+        const char* svc_path = "devices/\\hw\\pci0\\00:01.0\\com1\\a";
         sysarg_t baud = 9600;
         
@@ -56 +56 @@
         
         if (argc > 2) {
-                devpath = argv[2];
+                svc_path = argv[2];
         }
         
@@ -64 +64 @@
         }
         
-        devman_handle_t device;
-        int rc = devman_fun_get_handle(devpath, &device, IPC_FLAG_BLOCKING);
+        service_id_t svc_id;
+        int rc = loc_service_get_id(svc_path, &svc_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                fprintf(stderr, "Cannot open device %s\n", devpath);
+                fprintf(stderr, "Cannot find device service %s\n", svc_path);
                 return 1;
         }
         
-        async_sess_t *sess = devman_device_connect(EXCHANGE_SERIALIZE, device,
+        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
             IPC_FLAG_BLOCKING);
         if (!sess) {
-                fprintf(stderr, "Cannot connect device\n");
+                fprintf(stderr, "Failed connecting to service %s\n", svc_path);
         }
         
@@ -83 +83 @@
         
         if (rc != EOK) {
-                fprintf(stderr, "Cannot set serial properties\n");
+                fprintf(stderr, "Failed setting serial properties\n");
                 return 2;
         }
@@ -89 +89 @@
         uint8_t *buf = (uint8_t *) malloc(BUF_SIZE);
         if (buf == NULL) {
-                fprintf(stderr, "Cannot allocate buffer\n");
+                fprintf(stderr, "Failed allocating buffer\n");
                 return 3;
         }

uspace/app/tester/hw/serial/serial1.c

@@ -42 +42 @@
 #include <async.h>
 #include <ipc/services.h>
-#include <ipc/devman.h>
-#include <devman.h>
+#include <loc.h>
 #include <device/char_dev.h>
 #include <str.h>
@@ -71 +70 @@
                 }
         
-        devman_handle_t handle;
-        int res = devman_fun_get_handle("/hw/pci0/00:01.0/com1/a", &handle,
-            IPC_FLAG_BLOCKING);
+        service_id_t svc_id;
+        int res = loc_service_get_id("devices/\\hw\\pci0\\00:01.0\\com1\\a",
+            &svc_id, IPC_FLAG_BLOCKING);
         if (res != EOK)
-                return "Could not get serial device handle";
-        
-        async_sess_t *sess = devman_device_connect(EXCHANGE_SERIALIZE, handle,
+                return "Failed getting serial port service ID";
+        
+        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
             IPC_FLAG_BLOCKING);
         if (!sess)
-                return "Unable to connect to serial device";
+                return "Failed connecting to serial device";
         
         char *buf = (char *) malloc(cnt + 1);
         if (buf == NULL) {
                 async_hangup(sess);
-                return "Failed to allocate input buffer";
+                return "Failed allocating input buffer";
         }
         
@@ -112 +111 @@
                 free(buf);
                 async_hangup(sess);
-                return "Failed to set serial communication parameters";
-        }
-        
-        TPRINTF("Trying to read %zu characters from serial device "
-            "(handle=%" PRIun ")\n", cnt, handle);
+                return "Failed setting serial communication parameters";
+        }
+        
+        TPRINTF("Trying reading %zu characters from serial device "
+            "(svc_id=%" PRIun ")\n", cnt, svc_id);
         
         size_t total = 0;
@@ -130 +129 @@
                         free(buf);
                         async_hangup(sess);
-                        return "Failed read from serial device";
+                        return "Failed reading from serial device";
                 }
                 
@@ -165 +164 @@
                                 free(buf);
                                 async_hangup(sess);
-                                return "Failed write to serial device";
+                                return "Failed writing to serial device";
                         }
                         

uspace/app/websrv/websrv.c

@@ -200 +200 @@
 {
         if (str_cmp(uri, "/") == 0)
-                uri = "/index.htm";
+                uri = "/index.html";
         
         char *fname;