Changeset ca48672 in mainline for uspace/srv/hid


Ignore:
Timestamp:
2025-06-20T15:18:27Z (5 weeks ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
cb20b05
Parents:
3951046
Message:

loc_service_register() needs to take a port ID argument.

Location:
uspace/srv/hid
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/console/console.c

    r3951046 rca48672  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * Copyright (c) 2011 Martin Decky
    44 * All rights reserved.
     
    963963
    964964                        if (loc_service_register(console_srv, vc,
    965                             &consoles[i].dsid) != EOK) {
     965                            fallback_port_id, &consoles[i].dsid) != EOK) {
    966966                                printf("%s: Unable to register device %s\n", NAME, vc);
    967967                                return false;
  • uspace/srv/hid/display/main.c

    r3951046 rca48672  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    126126        ds_output_t *output = NULL;
    127127        gfx_context_t *gc = NULL;
    128         port_id_t disp_port;
    129         port_id_t gc_port;
    130         port_id_t wm_port;
    131         port_id_t dc_port;
     128        port_id_t port = 0;
    132129        loc_srv_t *srv = NULL;
    133130        service_id_t sid = 0;
     
    169166
    170167        rc = async_create_port(INTERFACE_DISPLAY, display_client_conn, disp,
    171             &disp_port);
    172         if (rc != EOK)
    173                 goto error;
    174 
    175         rc = async_create_port(INTERFACE_GC, display_gc_conn, disp, &gc_port);
    176         if (rc != EOK)
    177                 goto error;
    178 
    179         rc = async_create_port(INTERFACE_WNDMGT, display_wndmgt_conn, disp,
    180             &wm_port);
    181         if (rc != EOK)
    182                 goto error;
    183 
    184         rc = async_create_port(INTERFACE_DISPCFG, display_dispcfg_conn, disp,
    185             &dc_port);
     168            &port);
     169        if (rc != EOK)
     170                goto error;
     171
     172        rc = async_port_create_interface(port, INTERFACE_GC, display_gc_conn,
     173            disp);
     174        if (rc != EOK)
     175                goto error;
     176
     177        rc = async_port_create_interface(port, INTERFACE_WNDMGT,
     178            display_wndmgt_conn, disp);
     179        if (rc != EOK)
     180                goto error;
     181
     182        rc = async_port_create_interface(port, INTERFACE_DISPCFG,
     183            display_dispcfg_conn, disp);
    186184        if (rc != EOK)
    187185                goto error;
     
    194192        }
    195193
    196         rc = loc_service_register(srv, SERVICE_NAME_DISPLAY, &sid);
     194        rc = loc_service_register(srv, SERVICE_NAME_DISPLAY, port, &sid);
    197195        if (rc != EOK) {
    198196                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
     
    208206        if (srv != NULL)
    209207                loc_server_unregister(srv);
    210         // XXX destroy disp_port
    211         // XXX destroy gc_port
    212         // XXX destroy wm_port
    213         // XXX destroy dc_port
     208        if (port != 0)
     209                async_port_destroy(port);
    214210#if 0
    215211        if (disp->input != NULL)
  • uspace/srv/hid/input/input.c

    r3951046 rca48672  
    11/*
    2  * Copyright (c) 2023 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * Copyright (c) 2006 Josef Cejka
    44 * All rights reserved.
     
    909909
    910910        service_id_t service_id;
    911         rc = loc_service_register(srv, argv[1], &service_id);
     911        rc = loc_service_register(srv, argv[1], fallback_port_id, &service_id);
    912912        if (rc != EOK) {
    913913                printf("%s: Unable to register service %s\n", NAME, argv[1]);
  • uspace/srv/hid/isdv4_tablet/main.c

    r3951046 rca48672  
    11/*
    2  * Copyright (c) 2023 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * Copyright (c) 2012 Martin Sucha
    44 * All rights reserved.
     
    331331        }
    332332
    333         rc = loc_service_register(srv, service_name, &service_id);
     333        rc = loc_service_register(srv, service_name, fallback_port_id,
     334            &service_id);
    334335        if (rc != EOK) {
    335336                loc_server_unregister(srv);
  • uspace/srv/hid/output/output.c

    r3951046 rca48672  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * Copyright (c) 2011 Martin Decky
    44 * All rights reserved.
     
    488488
    489489        service_id_t service_id;
    490         rc = loc_service_register(srv, argv[1], &service_id);
     490        rc = loc_service_register(srv, argv[1], fallback_port_id, &service_id);
    491491        if (rc != EOK) {
    492492                loc_server_unregister(srv);
  • uspace/srv/hid/remcons/remcons.c

    r3951046 rca48672  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * Copyright (c) 2012 Vojtech Horky
    44 * All rights reserved.
     
    757757
    758758        errno_t rc = loc_service_register(remcons_srv, user->service_name,
    759             &user->service_id);
     759            fallback_port_id, &user->service_id);
    760760        if (rc != EOK) {
    761761                telnet_user_error(user, "Unable to register %s with loc: %s.",
  • uspace/srv/hid/rfb/main.c

    r3951046 rca48672  
    11/*
    2  * Copyright (c) 2023 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * Copyright (c) 2013 Martin Sucha
    44 * All rights reserved.
     
    498498        service_id_t service_id;
    499499
    500         rc = loc_service_register(srv, service_name, &service_id);
     500        rc = loc_service_register(srv, service_name, fallback_port_id,
     501            &service_id);
    501502        if (rc != EOK) {
    502503                printf(NAME ": Unable to register service %s.\n", service_name);
  • uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

    r3951046 rca48672  
    11/*
    2  * Copyright (c) 2023 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    103103        }
    104104
    105         rc = loc_service_register(srv, NAMESPACE "/mouse", &ts->service_id);
     105        rc = loc_service_register(srv, NAMESPACE "/mouse", fallback_port_id,
     106            &ts->service_id);
    106107        if (rc != EOK) {
    107108                // XXX s3c24xx_ts_fini();
Note: See TracChangeset for help on using the changeset viewer.