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

Changeset db6e419 in mainline for uspace/srv/bd/ata_bd/ata_bd.c


Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/bd/ata_bd/ata_bd.c

    re0e922d rdb6e419  
    5757#include <stdint.h>
    5858#include <str.h>
    59 #include <devmap.h>
     59#include <loc.h>
    6060#include <sys/types.h>
    6161#include <inttypes.h>
     
    176176               
    177177                snprintf(name, 16, "%s/ata%udisk%d", NAMESPACE, ctl_num, i);
    178                 rc = devmap_device_register(name, &disk[i].devmap_handle);
     178                rc = loc_service_register(name, &disk[i].service_id);
    179179                if (rc != EOK) {
    180180                        printf(NAME ": Unable to register device %s.\n", name);
     
    244244        int rc;
    245245
    246         rc = devmap_driver_register(NAME, ata_bd_connection);
     246        rc = loc_server_register(NAME, ata_bd_connection);
    247247        if (rc < 0) {
    248248                printf(NAME ": Unable to register driver.\n");
     
    277277        ipc_call_t call;
    278278        sysarg_t method;
    279         devmap_handle_t dh;
     279        service_id_t dsid;
    280280        size_t comm_size;       /**< Size of the communication area. */
    281281        unsigned int flags;
     
    285285        int disk_id, i;
    286286
    287         /* Get the device handle. */
    288         dh = IPC_GET_ARG1(*icall);
     287        /* Get the device service ID. */
     288        dsid = IPC_GET_ARG1(*icall);
    289289
    290290        /* Determine which disk device is the client connecting to. */
    291291        disk_id = -1;
    292292        for (i = 0; i < MAX_DISKS; i++)
    293                 if (disk[i].devmap_handle == dh)
     293                if (disk[i].service_id == dsid)
    294294                        disk_id = i;
    295295
Note: See TracChangeset for help on using the changeset viewer.