Changeset 8565a42 in mainline for kernel/generic/src/console/chardev.c


Ignore:
Timestamp:
2018-03-02T20:34:50Z (7 years ago)
Author:
GitHub <noreply@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a1a81f69, d5e5fd1
Parents:
3061bc1 (diff), 34e1206 (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.
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
git-committer:
GitHub <noreply@…> (2018-03-02 20:34:50)
Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/console/chardev.c

    r3061bc1 r8565a42  
    6868{
    6969        assert(indev);
    70        
     70
    7171        irq_spinlock_lock(&indev->lock, true);
    7272        if (indev->counter == INDEV_BUFLEN - 1) {
     
    7575                return;
    7676        }
    77        
     77
    7878        indev->counter++;
    7979        indev->buffer[indev->index++] = ch;
    80        
     80
    8181        /* Index modulo size of buffer */
    8282        indev->index = indev->index % INDEV_BUFLEN;
     
    102102                if (check_poll(indev))
    103103                        return indev->op->poll(indev);
    104                
     104
    105105                /* No other way of interacting with user */
    106106                interrupts_disable();
    107                
     107
    108108                if (CPU)
    109109                        printf("cpu%u: ", CPU->id);
    110110                else
    111111                        printf("cpu: ");
    112                
     112
    113113                printf("halted (no polling input)\n");
    114114                cpu_halt();
    115115        }
    116        
     116
    117117        waitq_sleep(&indev->wq);
    118118        irq_spinlock_lock(&indev->lock, true);
     
    121121        indev->counter--;
    122122        irq_spinlock_unlock(&indev->lock, true);
    123        
     123
    124124        return ch;
    125125}
     
    158158        if (indev == NULL)
    159159                return false;
    160        
     160
    161161        if (indev->op == NULL)
    162162                return false;
    163        
     163
    164164        return (indev->op->poll != NULL);
    165165}
Note: See TracChangeset for help on using the changeset viewer.