Changeset 15f3c3f in mainline for uspace/srv/hw


Ignore:
Timestamp:
2011-06-22T22:00:52Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
86ffa27f
Parents:
ef09a7a
Message:

Rename devmap to loc, devfs to locfs.

Location:
uspace/srv/hw
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hw/bus/cuda_adb/cuda_adb.c

    ref09a7a r15f3c3f  
    4343#include <ddi.h>
    4444#include <libarch/ddi.h>
    45 #include <devmap.h>
     45#include <loc.h>
    4646#include <sysinfo.h>
    4747#include <errno.h>
    … …  
    147147int main(int argc, char *argv[])
    148148{
    149         devmap_handle_t devmap_handle;
     149        service_id_t service_id;
    150150        int rc;
    151151        int i;
    … …  
    155155        for (i = 0; i < ADB_MAX_ADDR; ++i) {
    156156                adb_dev[i].client_phone = -1;
    157                 adb_dev[i].devmap_handle = 0;
    158         }
    159 
    160         rc = devmap_driver_register(NAME, cuda_connection);
     157                adb_dev[i].service_id = 0;
     158        }
     159
     160        rc = loc_server_register(NAME, cuda_connection);
    161161        if (rc < 0) {
    162                 printf(NAME ": Unable to register driver.\n");
     162                printf(NAME ": Unable to register server.\n");
    163163                return rc;
    164164        }
    165165
    166         rc = devmap_device_register("adb/kbd", &devmap_handle);
     166        rc = loc_service_register("adb/kbd", &service_id);
    167167        if (rc != EOK) {
    168                 printf(NAME ": Unable to register device %s.\n", "adb/kdb");
     168                printf(NAME ": Unable to register service %s.\n", "adb/kdb");
    169169                return rc;
    170170        }
    171171
    172         adb_dev[2].devmap_handle = devmap_handle;
    173         adb_dev[8].devmap_handle = devmap_handle;
    174 
    175         rc = devmap_device_register("adb/mouse", &devmap_handle);
     172        adb_dev[2].service_id = service_id;
     173        adb_dev[8].service_id = service_id;
     174
     175        rc = loc_service_register("adb/mouse", &service_id);
    176176        if (rc != EOK) {
    177                 printf(NAME ": Unable to register device %s.\n", "adb/mouse");
     177                printf(NAME ": Unable to register servise %s.\n", "adb/mouse");
    178178                return rc;
    179179        }
    180180
    181         adb_dev[9].devmap_handle = devmap_handle;
     181        adb_dev[9].service_id = service_id;
    182182
    183183        if (cuda_init() < 0) {
    … …  
    198198        ipc_call_t call;
    199199        sysarg_t method;
    200         devmap_handle_t dh;
     200        service_id_t dsid;
    201201        int retval;
    202202        int dev_addr, i;
    203203
    204204        /* Get the device handle. */
    205         dh = IPC_GET_ARG1(*icall);
     205        dsid = IPC_GET_ARG1(*icall);
    206206
    207207        /* Determine which disk device is the client connecting to. */
    208208        dev_addr = -1;
    209209        for (i = 0; i < ADB_MAX_ADDR; i++) {
    210                 if (adb_dev[i].devmap_handle == dh)
     210                if (adb_dev[i].service_id == dsid)
    211211                        dev_addr = i;
    212212        }
    … …  
    242242                         */
    243243                        for (i = 0; i < ADB_MAX_ADDR; ++i) {
    244                                 if (adb_dev[i].devmap_handle == dh) {
     244                                if (adb_dev[i].service_id == dsid) {
    245245                                        adb_dev[i].client_phone = IPC_GET_ARG5(call);
    246246                                }

  • uspace/srv/hw/bus/cuda_adb/cuda_adb.h

    ref09a7a r15f3c3f  
    3838
    3939#include <sys/types.h>
    40 #include <ipc/devmap.h>
     40#include <ipc/loc.h>
    4141#include <fibril_synch.h>
    4242
    … …  
    104104
    105105typedef struct {
    106         devmap_handle_t devmap_handle;
     106        service_id_t service_id;
    107107        int client_phone;
    108108} adb_dev_t;

  • uspace/srv/hw/char/i8042/i8042.c

    ref09a7a r15f3c3f  
    3939#include <ddi.h>
    4040#include <libarch/ddi.h>
    41 #include <devmap.h>
     41#include <loc.h>
    4242#include <async.h>
    4343#include <async_obsolete.h>
    … …  
    135135        printf(NAME ": i8042 PS/2 port driver\n");
    136136
    137         rc = devmap_driver_register(NAME, i8042_connection);
     137        rc = loc_server_register(NAME, i8042_connection);
    138138        if (rc < 0) {
    139                 printf(NAME ": Unable to register driver.\n");
     139                printf(NAME ": Unable to register server.\n");
    140140                return rc;
    141141        }
    … …  
    148148
    149149                snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
    150                 rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
     150                rc = loc_service_register(name, &i8042_port[i].service_id);
    151151                if (rc != EOK) {
    152152                        printf(NAME ": Unable to register device %s.\n", name);
    … …  
    221221        ipc_call_t call;
    222222        sysarg_t method;
    223         devmap_handle_t dh;
     223        service_id_t dsid;
    224224        int retval;
    225225        int dev_id, i;
    … …  
    228228
    229229        /* Get the device handle. */
    230         dh = IPC_GET_ARG1(*icall);
     230        dsid = IPC_GET_ARG1(*icall);
    231231
    232232        /* Determine which disk device is the client connecting to. */
    233233        dev_id = -1;
    234234        for (i = 0; i < MAX_DEVS; i++) {
    235                 if (i8042_port[i].devmap_handle == dh)
     235                if (i8042_port[i].service_id == dsid)
    236236                        dev_id = i;
    237237        }

  • uspace/srv/hw/char/i8042/i8042.h

    ref09a7a r15f3c3f  
    5252/** Softstate structure, one for each serial port (primary and aux). */
    5353typedef struct {
    54         devmap_handle_t devmap_handle;
     54        service_id_t service_id;
    5555        int client_phone;
    5656} i8042_port_t;

  • uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

    ref09a7a r15f3c3f  
    3939#include <ddi.h>
    4040#include <libarch/ddi.h>
    41 #include <devmap.h>
     41#include <loc.h>
    4242#include <ipc/char.h>
    4343#include <async.h>
    … …  
    8383        printf(NAME ": S3C24xx on-chip UART driver\n");
    8484
    85         rc = devmap_driver_register(NAME, s3c24xx_uart_connection);
     85        rc = loc_server_register(NAME, s3c24xx_uart_connection);
    8686        if (rc < 0) {
    87                 printf(NAME ": Unable to register driver.\n");
     87                printf(NAME ": Unable to register server.\n");
    8888                return -1;
    8989        }
    … …  
    9696                return -1;
    9797
    98         rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle);
     98        rc = loc_service_register(NAMESPACE "/" NAME, &uart->service_id);
    9999        if (rc != EOK) {
    100100                printf(NAME ": Unable to register device %s.\n",

  • uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h

    ref09a7a r15f3c3f  
    8787        int client_phone;
    8888
    89         /** Device handle */
    90         devmap_handle_t devmap_handle;
     89        /** Service ID */
     90        service_id_t service_id;
    9191} s3c24xx_uart_t;
    9292

  • uspace/srv/hw/irc/apic/apic.c

    ref09a7a r15f3c3f  
    5050#include <async.h>
    5151#include <stdio.h>
    52 #include <ipc/devmap.h>
     52#include <ipc/loc.h>
    5353
    5454#define NAME  "apic"

  • uspace/srv/hw/irc/fhc/fhc.c

    ref09a7a r15f3c3f  
    4949#include <async.h>
    5050#include <stdio.h>
    51 #include <ipc/devmap.h>
     51#include <ipc/loc.h>
    5252
    5353#define NAME "fhc"

  • uspace/srv/hw/irc/i8259/i8259.c

    ref09a7a r15f3c3f  
    5050#include <async.h>
    5151#include <stdio.h>
    52 #include <ipc/devmap.h>
     52#include <ipc/loc.h>
    5353
    5454#define NAME  "i8259"

  • uspace/srv/hw/irc/obio/obio.c

    ref09a7a r15f3c3f  
    5555#include <async.h>
    5656#include <stdio.h>
    57 #include <ipc/devmap.h>
     57#include <ipc/loc.h>
    5858
    5959#define NAME "obio"
Note: See TracChangeset for help on using the changeset viewer.