Changeset 0c2d9bb in mainline for uspace/app/sportdmp/sportdmp.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/sportdmp/sportdmp.c (modified) (9 diffs)

uspace/app/sportdmp/sportdmp.c

@@ -44 +44 @@
         sysarg_t baud = 9600;
         service_id_t svc_id;
-        
+
         int arg = 1;
         int rc;
-                
+
         if (argc > arg && str_test_prefix(argv[arg], "--baud=")) {
                 size_t arg_offset = str_lsize(argv[arg], 7);
@@ -65 +65 @@
                 arg++;
         }
-        
+
         if (argc > arg) {
                 rc = loc_service_get_id(argv[arg], &svc_id, 0);
@@ -77 +77 @@
         else {
                 category_id_t serial_cat_id;
-                
+
                 rc = loc_category_get_id("serial", &serial_cat_id, 0);
                 if (rc != EOK) {
@@ -84 +84 @@
                         return 1;
                 }
-                
+
                 service_id_t *svc_ids;
                 size_t svc_count;
-                
-                rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);                if (rc != EOK) {
+
+                rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);
+                if (rc != EOK) {
                         fprintf(stderr, "Failed getting list of services\n");
                         return 1;
                 }
-                
+
                 if (svc_count == 0) {
                         fprintf(stderr, "No service in category 'serial'\n");
@@ -98 +99 @@
                         return 1;
                 }
-                
+
                 svc_id = svc_ids[0];
                 free(svc_ids);
         }
-        
+
         if (argc > arg) {
                 fprintf(stderr, "Too many arguments\n");
@@ -108 +109 @@
                 return 1;
         }
-        
-        
+
+
         async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
             IPC_FLAG_BLOCKING);
@@ -115 +116 @@
                 fprintf(stderr, "Failed connecting to service\n");
         }
-        
+
         async_exch_t *exch = async_exchange_begin(sess);
         rc = async_req_4_0(exch, SERIAL_SET_COM_PROPS, baud,
             SERIAL_NO_PARITY, 8, 1);
         async_exchange_end(exch);
-        
+
         if (rc != EOK) {
                 fprintf(stderr, "Failed setting serial properties\n");
                 return 2;
         }
-        
+
         uint8_t *buf = (uint8_t *) malloc(BUF_SIZE);
         if (buf == NULL) {
@@ -131 +132 @@
                 return 3;
         }
-        
+
         while (true) {
                 ssize_t read = char_dev_read(sess, buf, BUF_SIZE);
@@ -144 +145 @@
                 fflush(stdout);
         }
-        
+
         free(buf);
         return 0;
 }
+