Changeset 3f03199 in mainline for uspace/app

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

Location:

uspace/app

Files:

• bdsh/cmds/modules/mount/mount.c (modified) (1 diff)
• corecfg/Makefile (added)
• corecfg/corecfg.c (added)
• devctl/devctl.c (modified) (7 diffs)
• df/Makefile (added)
• df/df.c (added)
• download/Makefile (added)
• download/main.c (added)
• edit/sheet.c (modified) (4 diffs)
• init/init.c (modified) (2 diffs)
• klog/klog.c (modified) (1 diff)
• netspeed/Makefile (added)
• netspeed/netspeed.c (added)
• sportdmp/sportdmp.c (modified) (9 diffs)
• tester/mm/common.c (modified) (2 diffs)
• trace/trace.c (modified) (1 diff)
• usbinfo/dump.c (modified) (1 diff)
• usbinfo/hid.c (modified) (1 diff)
• wavplay/dplay.c (modified) (5 diffs)
• wavplay/drec.c (modified) (1 diff)
• wavplay/main.c (modified) (2 diffs)
• wavplay/wave.c (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -74 +74 @@
         get_mtab_list(&mtab_list);
 
-        list_foreach(mtab_list, cur) {
-                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
-                    link);
-
+        list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
                 if (old_ent)
                         free(old_ent);

uspace/app/devctl/devctl.c

@@ -35 +35 @@
 #include <devman.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44 +45 @@
 #define MAX_NAME_LENGTH 1024
 
-char name[MAX_NAME_LENGTH];
-char drv_name[MAX_NAME_LENGTH];
+static char name[MAX_NAME_LENGTH];
+static char drv_name[MAX_NAME_LENGTH];
+static bool verbose = false;
+
+static const char *drv_state_str(driver_state_t state)
+{
+        const char *sstate;
+
+        switch (state) {
+        case DRIVER_NOT_STARTED:
+                sstate = "not started";
+                break;
+        case DRIVER_STARTING:
+                sstate = "starting";
+                break;
+        case DRIVER_RUNNING:
+                sstate = "running";
+                break;
+        default:
+                sstate = "unknown";
+        }
+
+        return sstate;
+}
 
 static int fun_subtree_print(devman_handle_t funh, int lvl)
@@ -52 +75 @@
         devman_handle_t *cfuns;
         size_t count, i;
+        unsigned int score;
         int rc;
         int j;
@@ -74 +98 @@
                 printf("%s : %s\n", name, drv_name);
 
+        if (verbose) {
+                for (i = 0; true; i++) {
+                        rc = devman_fun_get_match_id(funh, i, name, MAX_NAME_LENGTH,
+                            &score);
+                        if (rc != EOK)
+                                break;
+
+                        for (j = 0; j < lvl; j++)
+                                printf("    ");
+
+                        printf("    %u %s\n", score, name);
+                }
+        }
+
         rc = devman_fun_get_child(funh, &devh);
         if (rc == ENOENT)
@@ -159 +197 @@
 }
 
+static int drv_list(void)
+{
+        devman_handle_t *devs;
+        devman_handle_t *drvs;
+        driver_state_t state;
+        const char *sstate;
+        size_t ndrvs;
+        size_t ndevs;
+        size_t i;
+        int rc;
+
+        rc = devman_get_drivers(&drvs, &ndrvs);
+        if (rc != EOK)
+                return rc;
+
+        for (i = 0; i < ndrvs; i++) {
+                devs = NULL;
+
+                rc = devman_driver_get_name(drvs[i], drv_name, MAX_NAME_LENGTH);
+                if (rc != EOK)
+                        goto skip;
+                rc = devman_driver_get_state(drvs[i], &state);
+                if (rc != EOK)
+                        goto skip;
+                rc = devman_driver_get_devices(drvs[i], &devs, &ndevs);
+                if (rc != EOK)
+                        goto skip;
+
+                sstate = drv_state_str(state);
+
+                printf("%-11s %3zu %s\n", sstate, ndevs, drv_name);
+skip:
+                free(devs);
+        }
+        free(drvs);
+
+        return EOK;
+}
+
+static int drv_show(char *drvname)
+{
+        devman_handle_t *devs;
+        devman_handle_t drvh;
+        devman_handle_t funh;
+        driver_state_t state;
+        const char *sstate;
+        unsigned int score;
+        size_t ndevs;
+        size_t i;
+        int rc;
+
+        rc = devman_driver_get_handle(drvname, &drvh);
+        if (rc != EOK)
+                return rc;
+
+        devs = NULL;
+
+        rc = devman_driver_get_name(drvh, drv_name, MAX_NAME_LENGTH);
+        if (rc != EOK)
+                return rc;
+
+        rc = devman_driver_get_state(drvh, &state);
+        if (rc != EOK)
+                return rc;
+
+        rc = devman_driver_get_devices(drvh, &devs, &ndevs);
+        if (rc != EOK)
+                return rc;
+
+        sstate = drv_state_str(state);
+
+        printf("Driver: %s\n", drv_name);
+        printf("State: %s\n", sstate);
+
+        printf("Attached devices:\n");
+
+        for (i = 0; i < ndevs; i++) {
+                rc = devman_dev_get_parent(devs[i], &funh);
+                if (rc != EOK)
+                        goto error;
+
+                rc = devman_fun_get_path(funh, name, MAX_NAME_LENGTH);
+                if (rc != EOK)
+                        goto error;
+                printf("\t%s\n", name);
+        }
+
+        printf("Match IDs:\n");
+
+        for (i = 0; true; i++) {
+                rc = devman_driver_get_match_id(drvh, i, name, MAX_NAME_LENGTH,
+                    &score);
+                if (rc != EOK)
+                        break;
+
+                printf("\t%u %s\n", score, name);
+        }
+
+error:
+        free(devs);
+
+        return EOK;
+}
+
+static int drv_load(const char *drvname)
+{
+        int rc;
+        devman_handle_t drvh;
+
+        rc = devman_driver_get_handle(drvname, &drvh);
+        if (rc != EOK) {
+                printf("Failed resolving driver '%s' (%d).\n", drvname, rc);
+                return rc;
+        }
+
+        rc = devman_driver_load(drvh);
+        if (rc != EOK) {
+                printf("Failed loading driver '%s' (%d).\n", drvname, rc);
+                return rc;
+        }
+
+        return EOK;
+}
+
 static void print_syntax(void)
 {
-        printf("syntax: devctl [(online|offline) <function>]\n");
+        printf("syntax:\n");
+        printf("\tdevctl\n");
+        printf("\tdevctl online <function>]\n");
+        printf("\tdevctl offline <function>]\n");
+        printf("\tdevctl list-drv\n");
+        printf("\tdevctl show-drv <driver-name>\n");
+        printf("\tdevctl load-drv <driver-name>\n");
 }
 
@@ -168 +336 @@
         int rc;
 
-        if (argc == 1) {
+        if (argc == 1 || argv[1][0] == '-') {
+                if (argc > 1) {
+                        if (str_cmp(argv[1], "-v") == 0) {
+                                verbose = true;
+                        } else {
+                                printf(NAME ": Invalid argument '%s'\n", argv[1]);
+                                print_syntax();
+                                return 1;
+                        }
+                }
                 rc = fun_tree_print();
                 if (rc != EOK)
@@ -194 +371 @@
                         return 2;
                 }
+        } else if (str_cmp(argv[1], "list-drv") == 0) {
+                rc = drv_list();
+                if (rc != EOK)
+                        return 2;
+        } else if (str_cmp(argv[1], "show-drv") == 0) {
+                if (argc < 3) {
+                        printf(NAME ": Argument missing.\n");
+                        print_syntax();
+                        return 1;
+                }
+
+                rc = drv_show(argv[2]);
+                if (rc != EOK) {
+                        return 2;
+                }
+        } else if (str_cmp(argv[1], "load-drv") == 0) {
+                if (argc < 3) {
+                        printf(NAME ": Argument missing.\n");
+                        print_syntax();
+                        return 1;
+                }
+
+                rc = drv_load(argv[2]);
+                if (rc != EOK)
+                        return 2;
         } else {
                 printf(NAME ": Invalid argument '%s'.\n", argv[1]);

uspace/app/edit/sheet.c

@@ -105 +105 @@
         char *ipp;
         size_t sz;
-        tag_t *tag;
         char *newp;
 
@@ -128 +127 @@
         /* Adjust tags. */
 
-        list_foreach(sh->tags, link) {
-                tag = list_get_instance(link, tag_t, link);
-
+        list_foreach(sh->tags, link, tag_t, tag) {
                 if (tag->b_off > pos->b_off)
                         tag->b_off += sz;
@@ -154 +151 @@
         char *spp;
         size_t sz;
-        tag_t *tag;
         char *newp;
         size_t shrink_size;
@@ -165 +161 @@
 
         /* Adjust tags. */
-        list_foreach(sh->tags, link) {
-                tag = list_get_instance(link, tag_t, link);
-
+        list_foreach(sh->tags, link, tag_t, tag) {
                 if (tag->b_off >= epos->b_off)
                         tag->b_off -= sz;

uspace/app/init/init.c

@@ -384 +384 @@
         srv_start("/srv/input", HID_INPUT);
         srv_start("/srv/output", HID_OUTPUT);
+        srv_start("/srv/hound");
         
         int rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
@@ -392 +393 @@
                 rc = console(HID_INPUT, HID_OUTPUT);
                 if (rc == EOK) {
-#ifndef CONFIG_VC_COUNT
-#define CONFIG_VC_COUNT 6
-#endif
-                        switch((unsigned)CONFIG_VC_COUNT) {
-                        default:
-                        case 6: getterm("term/vc5", "/app/bdsh", false);
-                        case 5: getterm("term/vc4", "/app/bdsh", false);
-                        case 4: getterm("term/vc3", "/app/bdsh", false);
-                        case 3: getterm("term/vc2", "/app/bdsh", false);
-                        case 2: getterm("term/vc1", "/app/bdsh", false);
-                        case 1: getterm("term/vc0", "/app/bdsh", true);
-                        }
-#ifdef CONFIG_KERNEL_LOG_VC_6
+                        getterm("term/vc0", "/app/bdsh", true);
+                        getterm("term/vc1", "/app/bdsh", false);
+                        getterm("term/vc2", "/app/bdsh", false);
+                        getterm("term/vc3", "/app/bdsh", false);
+                        getterm("term/vc4", "/app/bdsh", false);
+                        getterm("term/vc5", "/app/bdsh", false);
                         getterm("term/vc6", "/app/klog", false);
-#endif
                 }
         }
-        srv_start("/srv/hound");
         
         return 0;

uspace/app/klog/klog.c

@@ -206 +206 @@
         klog_length = size / sizeof(wchar_t);
         
-        rc = physmem_map((void *) faddr, pages,
-            AS_AREA_READ | AS_AREA_CACHEABLE, (void *) &klog);
+        rc = physmem_map(faddr, pages, AS_AREA_READ | AS_AREA_CACHEABLE,
+            (void *) &klog);
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to map klog\n", NAME);

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;
 }
+

uspace/app/tester/mm/common.c

@@ -84 +84 @@
 }
 
-static bool overlap_match(link_t *link, void *addr, size_t size)
-{
-        mem_block_t *block = list_get_instance(link, mem_block_t, link);
-        
+static bool overlap_match(mem_block_t *block, void *addr, size_t size)
+{
         /* Entry block control structure <mbeg, mend) */
         uint8_t *mbeg = (uint8_t *) block;
@@ -125 +123 @@
         bool fnd = false;
         
-        list_foreach(mem_blocks, link) {
-                if (overlap_match(link, addr, size)) {
+        list_foreach(mem_blocks, link, mem_block_t, block) {
+                if (overlap_match(block, addr, size)) {
                         fnd = true;
                         break;

uspace/app/trace/trace.c

@@ -724 +724 @@
         o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_STAT, o);
+        o = oper_new("statfs", 0, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_STATFS, o);
 
         proto_register(SERVICE_VFS, p);

uspace/app/usbinfo/dump.c

@@ -103 +103 @@
 void dump_match_ids(match_id_list_t *matches, const char *line_prefix)
 {
-        list_foreach(matches->ids, link) {
-                match_id_t *match = list_get_instance(link, match_id_t, link);
-
+        list_foreach(matches->ids, link, match_id_t, match) {
                 printf("%s%3d %s\n", line_prefix, match->score, match->id);
         }

uspace/app/usbinfo/hid.c

@@ -101 +101 @@
         printf("%sParsed HID report descriptor for interface %d\n",
             get_indent(0), iface_no);
-        list_foreach(report->reports, report_it) {
-                usb_hid_report_description_t *description = list_get_instance(
-                    report_it, usb_hid_report_description_t, reports_link);
+        list_foreach(report->reports, reports_link,
+            usb_hid_report_description_t, description) {
                 printf("%sReport %d (type %d)\n", get_indent(1),
                     (int) description->report_id,
                     (int) description->type);
-                list_foreach(description->report_items, item_it) {
-                        usb_hid_report_field_t *field = list_get_instance(
-                            item_it, usb_hid_report_field_t, ritems_link);
+                list_foreach(description->report_items, ritems_link,
+                    usb_hid_report_field_t, field) {
                         printf("%sUsage page = 0x%04x    Usage = 0x%04x\n",
                             get_indent(2),

uspace/app/wavplay/dplay.c

@@ -151 +151 @@
             device_event_callback, pb);
         if (ret != EOK) {
-                printf("Failed to register event callback.\n");
+                printf("Failed to register event callback: %s.\n",
+                    str_error(ret));
                 return;
         }
@@ -285 +286 @@
                             pb->f.sample_format);
                         if (ret != EOK) {
-                                printf("Failed to start playback\n");
+                                printf("Failed to start playback: %s\n",
+                                    str_error(ret));
                                 return;
                         }
@@ -291 +293 @@
                         ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                         if (ret != EOK) {
-                                printf("Failed to update position indicator\n");
+                                printf("Failed to update position indicator "
+                                   "%s\n", str_error(ret));
                         }
                 }
@@ -308 +311 @@
                 const int ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                 if (ret != EOK) {
-                        printf("Failed to update position indicator\n");
+                        printf("Failed to update position indicator %s\n",
+                            str_error(ret));
                 }
                 getuptime(&time);
@@ -350 +354 @@
         ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {
-                printf("Failed to get PCM info.\n");
+                printf("Failed to get PCM info: %s.\n", str_error(ret));
                 goto close_session;
         }

uspace/app/wavplay/drec.c

@@ -213 +213 @@
         wave_header_t header;
         fseek(rec.file, sizeof(header), SEEK_SET);
-        const char *error;
-        if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+        if (ret != EOK) {
+                printf("Error parsing wav header\n");
                 goto cleanup;
         }

uspace/app/wavplay/main.c

@@ -79 +79 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+                printf("Error parsing `%s' wav header: %s.\n", filename, error);
                 fclose(source);
                 return EINVAL;
         }
+
+        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
+            format.channels, format.sampling_rate,
+            pcm_sample_format_str(format.sample_format));
 
         /* Allocate buffer and create new context */
@@ -136 +140 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+                printf("Error parsing `%s' wav header: %s.\n", filename, error);
                 fclose(source);
                 return EINVAL;
         }
+        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
+            format.channels, format.sampling_rate,
+            pcm_sample_format_str(format.sample_format));
 
         /* Connect new playback context */

uspace/app/wavplay/wave.c

@@ -81 +81 @@
         }
 
-        if (uint16_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
+        if (uint32_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
+                //TODO subchunk 1 sizes other than 16 are allowed ( 18, 40)
+                //http://www-mmsp.ece.mcgill.ca/documents/AudioFormats/WAVE/WAVE.html
                 if (error)
                         *error = "invalid subchunk1 size";
-                return EINVAL;
+//              return EINVAL;
         }
 
@@ -94 +96 @@
 
         if (str_lcmp(header->subchunk2_id, SUBCHUNK2_ID, 4) != 0) {
+                //TODO basedd on subchunk1 size, we might be reading wrong
+                //offset
                 if (error)
                         *error = "invalid subchunk2 id";
-                return EINVAL;
+//              return EINVAL;
         }
 
 
+        //TODO data and data_size are incorrect in extended wav formats
+        //pcm params are OK
         if (data)
                 *data = header->data;