Changeset 94e46c9 in mainline for uspace/app


Ignore:
Timestamp:
2015-05-23T04:09:11Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b5143bd
Parents:
a25d893 (diff), 0683992 (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:

Mainline changes

Location:
uspace/app
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/cmds/modules/cat/cat.c

    ra25d893 r94e46c9  
    324324        argc = cli_count_args(argv);
    325325
    326         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
     326        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
    327327                c = getopt_long(argc, argv, "xhvmH:t:b:s:n", long_options, &opt_ind);
    328328                switch (c) {

  • uspace/app/bdsh/cmds/modules/cmp/cmp.c

    ra25d893 r94e46c9  
    130130        argc = cli_count_args(argv);
    131131
    132         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
     132        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
    133133                c = getopt_long(argc, argv, "hv", long_options, &opt_ind);
    134134                switch (c) {

  • uspace/app/bdsh/cmds/modules/cp/cp.c

    ra25d893 r94e46c9  
    457457        argc = cli_count_args(argv);
    458458
    459         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
     459        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
    460460                c = getopt_long(argc, argv, "hvVfirb:", long_options, &opt_ind);
    461461                switch (c) {

  • uspace/app/bdsh/cmds/modules/ls/ls.c

    ra25d893 r94e46c9  
    362362        argc = cli_count_args(argv);
    363363       
    364         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
     364        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
    365365                c = getopt_long(argc, argv, "hur", long_options, &opt_ind);
    366366                switch (c) {

  • uspace/app/bdsh/cmds/modules/mkdir/mkdir.c

    ra25d893 r94e46c9  
    173173        argc = cli_count_args(argv);
    174174
    175         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
     175        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
    176176                c = getopt_long(argc, argv, "pvhVfm:", long_options, &opt_ind);
    177177                switch (c) {

  • uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

    ra25d893 r94e46c9  
    126126        argc = cli_count_args(argv);
    127127
    128         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
     128        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
    129129                c = getopt_long(argc, argv, "ps:h", long_options, &opt_ind);
    130130                switch (c) {

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

    ra25d893 r94e46c9  
    118118        argc = cli_count_args(argv);
    119119
    120         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
     120        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
    121121                c = getopt_long(argc, argv, "i:h", long_options, &opt_ind);
    122122                switch (c) {

  • uspace/app/bdsh/cmds/modules/rm/rm.c

    ra25d893 r94e46c9  
    261261        }
    262262
    263         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
     263        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
    264264                c = getopt_long(argc, argv, "hvrfs", long_options, &opt_ind);
    265265                switch (c) {

  • uspace/app/bdsh/cmds/modules/touch/touch.c

    ra25d893 r94e46c9  
    9090        DIR *dirp;
    9191       
    92         for (c = 0, optind = 0, longind = 0; c != -1; ) {
     92        for (c = 0, optreset = 1, optind = 0, longind = 0; c != -1; ) {
    9393                c = getopt_long(argc, argv, "c", long_options, &longind);
    9494                switch (c) {

  • uspace/app/wavplay/drec.c

    ra25d893 r94e46c9  
    4747
    4848
    49 #define BUFFER_PARTS   2
     49#define BUFFER_PARTS   16
    5050
    5151/** Recording format */
    … …  
    103103                        printf("Recording terminated\n");
    104104                        record = false;
     105                        break;
    105106                case PCM_EVENT_FRAMES_CAPTURED:
    106107                        printf("%" PRIun " frames\n", IPC_GET_ARG1(call));
    107                         async_answer_0(callid, EOK);
    108108                        break;
    109109                default:
    … …  
    111111                        async_answer_0(callid, ENOTSUP);
    112112                        continue;
    113 
     113                }
     114
     115                if (!record) {
     116                        async_answer_0(callid, EOK);
     117                        break;
    114118                }
    115119
    … …  
    156160        printf("\n");
    157161        audio_pcm_stop_capture(rec->device);
     162        /* XXX Control returns even before we can be sure callbacks finished */
     163        printf("Delay before playback termination\n");
     164        async_usleep(1000000);
     165        printf("Terminate playback\n");
    158166}
    159167

  • uspace/app/wavplay/main.c

    ra25d893 r94e46c9  
    308308                        if (direct) {
    309309                                drecord(device, file);
     310                                continue;
    310311                        } else {
    311312                                printf("Indirect recording is not supported "

  • uspace/app/wavplay/wave.c

    ra25d893 r94e46c9  
    116116                *channels = uint16_t_le2host(header->channels);
    117117        if (format) {
    118                 const unsigned size = uint32_t_le2host(header->sample_size);
     118                const unsigned size = uint16_t_le2host(header->sample_size);
    119119                switch (size) {
    120120                case 8: *format = PCM_SAMPLE_UINT8; break;
    … …  
    157157        header->channels = host2uint32_t_le(format.channels);
    158158        header->sample_size =
    159             host2uint32_t_le(pcm_sample_format_size(format.sample_format));
     159            host2uint16_t_le(pcm_sample_format_size(format.sample_format) * 8);
    160160}
    161161/**
Note: See TracChangeset for help on using the changeset viewer.