Changeset 235bd1f in mainline


Ignore:
Timestamp:
2025-06-20T19:39:22Z (16 hours ago)
Author:
GitHub <noreply@…>
Parents:
5caad1d (diff), 4c103ee (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.
git-author:
Miroslav Cimerman <70661600+mcimerman@…> (2025-06-20 19:39:22)
git-committer:
GitHub <noreply@…> (2025-06-20 19:39:22)
Message:

Merge 4c103ee788983c2e5c1aa72a4fa01f0b179a8d90 into 5caad1d4a9774280b120ed9f9da51f4bb6f1f4bf

Files:
36 added
7 edited

Legend:

Unmodified
Added
Removed

  • abi/include/abi/ipc/interfaces.h

    r5caad1d r235bd1f  
    206206            FOURCC_COMPACT('s', 's', 't', 'm') | IFACE_EXCHANGE_SERIALIZE,
    207207        INTERFACE_SYSTEM_CB =
    208             FOURCC_COMPACT('s', 's', 't', 'm') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK
     208            FOURCC_COMPACT('s', 's', 't', 'm') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
     209        INTERFACE_HR =
     210            FOURCC_COMPACT('h', 'r', ' ', ' ') | IFACE_EXCHANGE_SERIALIZE
    209211} iface_t;
    210212

  • uspace/app/meson.build

    r5caad1d r235bd1f  
    3131        'barber',
    3232        'bdsh',
     33        'bdwrite',
    3334        'bithenge',
    3435        'blkdump',
    … …  
    5253        'hbench',
    5354        'hello',
     55        'hrctl',
    5456        'inet',
    5557        'init',

  • uspace/lib/c/include/ipc/services.h

    r5caad1d r235bd1f  
    5858#define SERVICE_NAME_DISPLAY  "hid/display"
    5959#define SERVICE_NAME_WNDMGT   "hid/display"
     60#define SERVICE_NAME_HR       "hr"
    6061#define SERVICE_NAME_DHCP     "net/dhcp"
    6162#define SERVICE_NAME_DNSR     "net/dnsr"

  • uspace/lib/device/meson.build

    r5caad1d r235bd1f  
    3232        'src/devman.c',
    3333        'src/device/led_dev.c',
     34        'src/hr.c',
    3435        'src/io/chardev.c',
    3536        'src/io/chardev_srv.c',

  • uspace/srv/locsrv/locsrv.c

    r5caad1d r235bd1f  
    13301330        categ_dir_add_cat(&cdir, cat);
    13311331
     1332        cat = category_new("raid");
     1333        categ_dir_add_cat(&cdir, cat);
     1334
    13321335        cat = category_new("partition");
    13331336        categ_dir_add_cat(&cdir, cat);

  • uspace/srv/meson.build

    r5caad1d r235bd1f  
    3131        'audio/hound',
    3232        'bd/file_bd',
     33        'bd/hr',
    3334        'bd/rd',
    3435        'bd/vbd',

  • uspace/srv/system/system.c

    r5caad1d r235bd1f  
    477477        srv_start("/srv/bd/vbd");
    478478        srv_start("/srv/volsrv");
     479        srv_start("/srv/bd/hr");
    479480
    480481        init_sysvol();
Note: See TracChangeset for help on using the changeset viewer.