Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 02aad10 in mainline


Ignore:
Timestamp:
2012-01-24T16:32:55Z (8 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
master
Children:
db2f654
Parents:
cd1cc4e6 (diff), 876f6463 (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/char/i8042/i8042.c

    rcd1cc4e6 r02aad10  
    307307       
    308308        for (size_t i = 0; i < size; ++i) {
    309                 wait_ready(controller);
    310                
    311                 if (controller->aux_fun == fun)
     309                if (controller->aux_fun == fun) {
     310                        wait_ready(controller);
    312311                        pio_write_8(&controller->regs->status,
    313312                            i8042_CMD_WRITE_AUX);
     313                }
    314314               
     315                wait_ready(controller);
    315316                pio_write_8(&controller->regs->data, buffer[i]);
    316317        }
Note: See TracChangeset for help on using the changeset viewer.