Changeset c2b2de7 in mainline for uspace/srv/hid/output/port/ega.c


Ignore:
Timestamp:
2012-10-17T22:17:29Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
150a271
Parents:
6454ad47 (diff), 57912af3 (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 changes from bbxm branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified uspace/srv/hid/output/port/ega.c

    r6454ad47 rc2b2de7  
    3636#include <as.h>
    3737#include <ddi.h>
    38 #include <libarch/ddi.h>
    3938#include <io/chargrid.h>
    4039#include "../output.h"
     
    211210                return rc;
    212211       
    213         rc = iospace_enable(task_get_id(), (void *) EGA_IO_BASE,
    214             EGA_IO_SIZE);
     212        rc = pio_enable((void*)EGA_IO_BASE, EGA_IO_SIZE, NULL);
    215213        if (rc != EOK)
    216214                return rc;
Note: See TracChangeset for help on using the changeset viewer.