Changeset 8565a42 in mainline for kernel/genarch/src/drivers/i8042


Ignore:
Timestamp:
2018-03-02T20:34:50Z (8 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/genarch/src/drivers/i8042/i8042.c

    r3061bc1 r8565a42  
    5959        i8042_instance_t *i8042_instance = irq->instance;
    6060        i8042_t *dev = i8042_instance->i8042;
    61        
     61
    6262        if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK)
    6363                return IRQ_ACCEPT;
     
    7070        i8042_instance_t *instance = irq->instance;
    7171        i8042_t *dev = instance->i8042;
    72        
     72
    7373        if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) {
    7474                uint8_t data = pio_read_8(&dev->data);
     
    8383                if ((pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) == 0)
    8484                        break;
    85                
     85
    8686                (void) pio_read_8(&dev->data);
    8787                delay(50);  /* 50 us think time */
     
    9494                if ((pio_read_8(&dev->status) & i8042_WAIT_MASK) == 0)
    9595                        break;
    96                
     96
    9797                delay(50);  /* 50 us think time */
    9898        }
    99        
     99
    100100        pio_write_8(&dev->status, cmd);
    101101        delay(10000);  /* 10 ms think time */
     
    110110                instance->i8042 = dev;
    111111                instance->kbrdin = NULL;
    112                
     112
    113113                irq_initialize(&instance->irq);
    114114                instance->irq.inr = inr;
     
    117117                instance->irq.instance = instance;
    118118        }
    119        
     119
    120120        return instance;
    121121}
     
    125125        assert(instance);
    126126        assert(kbrdin);
    127        
     127
    128128        i8042_clear_buffer(instance->i8042);
    129        
     129
    130130        instance->kbrdin = kbrdin;
    131131        irq_register(&instance->irq);
Note: See TracChangeset for help on using the changeset viewer.