Changeset 8a9a41e in mainline for uspace

Timestamp:

2021-10-24T08:28:43Z (4 years ago)

Author:

GitHub <noreply@…>

Children:

0889391

Parents:

2ce943a (diff), cd981f2a (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:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

Location:

uspace

Files:

• app/calculator/calculator.c (modified) (view diffs)
• app/edit/edit.c (modified) (view diffs)
• app/edit/meson.build (modified) (view diffs)
• app/gfxdemo/gfxdemo.c (modified) (view diffs)
• app/hello/hello.c (modified) (view diffs)
• app/inet/inet.c (modified) (view diffs)
• app/tester/meson.build (modified) (view diffs)
• app/tester/print/print4.c (modified) (view diffs)
• app/tetris/screen.c (modified) (view diffs)
• app/uidemo/uidemo.c (modified) (view diffs)
• app/uidemo/uidemo.h (modified) (view diffs)
• drv/char/i8042/i8042.h (modified) (view diffs)
• drv/meson.build (modified) (view diffs)
• drv/platform/hikey960/hikey960.c (added)
• drv/platform/hikey960/hikey960.ma (added)
• drv/platform/hikey960/meson.build (added)
• lib/c/generic/io/asprintf.c (modified) (view diffs)
• lib/c/generic/io/console.c (modified) (view diffs)
• lib/c/include/adt/list.h (modified) (view diffs)
• lib/codepage/doc/doxygroups.h (added)
• lib/codepage/include/codepage/cp437.h (added)
• lib/codepage/meson.build (added)
• lib/codepage/src/cp437.c (added)
• lib/codepage/test/cp437.c (added)
• lib/codepage/test/main.c (moved) (moved from kernel/arch/arm64/src/smc.c ) (view diffs)
• lib/congfx/src/console.c (modified) (view diffs)
• lib/ddev/include/ipc/ddev.h (modified) (view diffs)
• lib/device/include/bd.h (modified) (view diffs)
• lib/device/include/bd_srv.h (modified) (view diffs)
• lib/device/include/device/led_dev.h (modified) (view diffs)
• lib/device/include/devman.h (modified) (view diffs)
• lib/device/include/ieee80211/ieee80211.h (modified) (view diffs)
• lib/device/include/io/chardev.h (modified) (view diffs)
• lib/device/include/io/chardev_srv.h (modified) (view diffs)
• lib/device/include/io/label.h (modified) (view diffs)
• lib/device/include/io/serial.h (modified) (view diffs)
• lib/device/include/ipc/adb.h (modified) (view diffs)
• lib/device/include/ipc/bd.h (modified) (view diffs)
• lib/device/include/ipc/chardev.h (modified) (view diffs)
• lib/device/include/ipc/devman.h (modified) (view diffs)
• lib/device/include/ipc/irc.h (modified) (view diffs)
• lib/device/include/ipc/pci.h (modified) (view diffs)
• lib/device/include/ipc/serial_ctl.h (modified) (view diffs)
• lib/device/include/ipc/vbd.h (modified) (view diffs)
• lib/device/include/ipc/vol.h (modified) (view diffs)
• lib/device/include/irc.h (modified) (view diffs)
• lib/device/include/nic/eth_phys.h (modified) (view diffs)
• lib/device/include/nic/nic.h (modified) (view diffs)
• lib/device/include/pci.h (modified) (view diffs)
• lib/device/include/types/io/chardev.h (modified) (view diffs)
• lib/device/include/types/label.h (modified) (view diffs)
• lib/device/include/types/pci.h (modified) (view diffs)
• lib/device/include/types/vol.h (modified) (view diffs)
• lib/device/include/vbd.h (modified) (view diffs)
• lib/device/include/vol.h (modified) (view diffs)
• lib/device/src/bd.c (modified) (view diffs)
• lib/device/src/bd_srv.c (modified) (view diffs)
• lib/device/src/device/led_dev.c (modified) (view diffs)
• lib/device/src/devman.c (modified) (view diffs)
• lib/device/src/io/chardev.c (modified) (view diffs)
• lib/device/src/io/chardev_srv.c (modified) (view diffs)
• lib/device/src/io/label.c (modified) (view diffs)
• lib/device/src/irc.c (modified) (view diffs)
• lib/device/src/pci.c (modified) (view diffs)
• lib/device/src/vbd.c (modified) (view diffs)
• lib/device/src/vol.c (modified) (view diffs)
• lib/display/include/ipc/display.h (modified) (view diffs)
• lib/drv/generic/remote_ieee80211.c (modified) (view diffs)
• lib/drv/include/battery_iface.h (modified) (view diffs)
• lib/drv/include/ieee80211_iface.h (modified) (view diffs)
• lib/drv/include/nic_iface.h (modified) (view diffs)
• lib/gfx/include/gfx/color.h (modified) (view diffs)
• lib/gfx/include/gfx/cursor.h (added)
• lib/gfx/include/types/gfx/ops/context.h (modified) (view diffs)
• lib/gfx/meson.build (modified) (view diffs)
• lib/gfx/private/color.h (modified) (view diffs)
• lib/gfx/src/color.c (modified) (view diffs)
• lib/gfx/src/cursor.c (added)
• lib/gfx/test/cursor.c (added)
• lib/gfx/test/main.c (modified) (view diffs)
• lib/gfxfont/include/gfx/text.h (modified) (view diffs)
• lib/gfxfont/include/types/gfx/text.h (modified) (view diffs)
• lib/gfxfont/src/text.c (modified) (view diffs)
• lib/gfxfont/test/text.c (modified) (view diffs)
• lib/inet/include/inet/addr.h (modified) (view diffs)
• lib/inet/include/inet/dhcp.h (modified) (view diffs)
• lib/inet/include/inet/dnsr.h (modified) (view diffs)
• lib/inet/include/inet/endpoint.h (modified) (view diffs)
• lib/inet/include/inet/eth_addr.h (added)
• lib/inet/include/inet/host.h (modified) (view diffs)
• lib/inet/include/inet/hostname.h (modified) (view diffs)
• lib/inet/include/inet/hostport.h (modified) (view diffs)
• lib/inet/include/inet/inet.h (modified) (view diffs)
• lib/inet/include/inet/inetcfg.h (modified) (view diffs)
• lib/inet/include/inet/inetping.h (modified) (view diffs)
• lib/inet/include/inet/iplink.h (modified) (view diffs)
• lib/inet/include/inet/iplink_srv.h (modified) (view diffs)
• lib/inet/include/inet/tcp.h (modified) (view diffs)
• lib/inet/include/inet/udp.h (modified) (view diffs)
• lib/inet/include/ipc/dhcp.h (modified) (view diffs)
• lib/inet/include/ipc/dnsr.h (modified) (view diffs)
• lib/inet/include/ipc/inet.h (modified) (view diffs)
• lib/inet/include/ipc/iplink.h (modified) (view diffs)
• lib/inet/include/ipc/tcp.h (modified) (view diffs)
• lib/inet/include/ipc/udp.h (modified) (view diffs)
• lib/inet/include/types/inet.h (modified) (view diffs)
• lib/inet/include/types/inet/host.h (modified) (view diffs)
• lib/inet/include/types/inet/hostport.h (modified) (view diffs)
• lib/inet/include/types/inetcfg.h (modified) (view diffs)
• lib/inet/include/types/inetping.h (modified) (view diffs)
• lib/inet/meson.build (modified) (view diffs)
• lib/inet/src/addr.c (modified) (view diffs)
• lib/inet/src/dhcp.c (modified) (view diffs)
• lib/inet/src/endpoint.c (modified) (view diffs)
• lib/inet/src/eth_addr.c (added)
• lib/inet/src/host.c (modified) (view diffs)
• lib/inet/src/hostname.c (modified) (view diffs)
• lib/inet/src/hostport.c (modified) (view diffs)
• lib/inet/src/inetcfg.c (modified) (view diffs)
• lib/inet/src/iplink.c (modified) (view diffs)
• lib/inet/src/iplink_srv.c (modified) (view diffs)
• lib/inet/src/tcp.c (modified) (view diffs)
• lib/inet/src/udp.c (modified) (view diffs)
• lib/inet/test/eth_addr.c (added)
• lib/inet/test/main.c (added)
• lib/memgfx/include/memgfx/memgc.h (modified) (view diffs)
• lib/memgfx/include/memgfx/xlategc.h (added)
• lib/memgfx/include/types/memgfx/memgc.h (modified) (view diffs)
• lib/memgfx/include/types/memgfx/xlategc.h (added)
• lib/memgfx/meson.build (modified) (view diffs)
• lib/memgfx/private/memgc.h (modified) (view diffs)
• lib/memgfx/private/xlategc.h (added)
• lib/memgfx/src/memgc.c (modified) (view diffs)
• lib/memgfx/src/xlategc.c (added)
• lib/memgfx/test/main.c (modified) (view diffs)
• lib/memgfx/test/memgfx.c (modified) (view diffs)
• lib/memgfx/test/xlategc.c (added)
• lib/meson.build (modified) (view diffs)
• lib/ui/include/types/ui/control.h (modified) (view diffs)
• lib/ui/include/types/ui/filedialog.h (added)
• lib/ui/include/types/ui/paint.h (modified) (view diffs)
• lib/ui/include/types/ui/promptdialog.h (added)
• lib/ui/include/types/ui/ui.h (modified) (view diffs)
• lib/ui/include/ui/control.h (modified) (view diffs)
• lib/ui/include/ui/entry.h (modified) (view diffs)
• lib/ui/include/ui/filedialog.h (added)
• lib/ui/include/ui/fixed.h (modified) (view diffs)
• lib/ui/include/ui/label.h (modified) (view diffs)
• lib/ui/include/ui/msgdialog.h (modified) (view diffs)
• lib/ui/include/ui/paint.h (modified) (view diffs)
• lib/ui/include/ui/promptdialog.h (added)
• lib/ui/include/ui/rbutton.h (modified) (view diffs)
• lib/ui/include/ui/resource.h (modified) (view diffs)
• lib/ui/include/ui/window.h (modified) (view diffs)
• lib/ui/meson.build (modified) (view diffs)
• lib/ui/private/checkbox.h (modified) (view diffs)
• lib/ui/private/entry.h (modified) (view diffs)
• lib/ui/private/filedialog.h (added)
• lib/ui/private/label.h (modified) (view diffs)
• lib/ui/private/menu.h (modified) (view diffs)
• lib/ui/private/promptdialog.h (added)
• lib/ui/private/rbutton.h (modified) (view diffs)
• lib/ui/private/resource.h (modified) (view diffs)
• lib/ui/private/slider.h (modified) (view diffs)
• lib/ui/private/ui.h (modified) (view diffs)
• lib/ui/private/window.h (modified) (view diffs)
• lib/ui/src/checkbox.c (modified) (view diffs)
• lib/ui/src/control.c (modified) (view diffs)
• lib/ui/src/entry.c (modified) (view diffs)
• lib/ui/src/filedialog.c (added)
• lib/ui/src/fixed.c (modified) (view diffs)
• lib/ui/src/label.c (modified) (view diffs)
• lib/ui/src/menu.c (modified) (view diffs)
• lib/ui/src/menuentry.c (modified) (view diffs)
• lib/ui/src/msgdialog.c (modified) (view diffs)
• lib/ui/src/paint.c (modified) (view diffs)
• lib/ui/src/pbutton.c (modified) (view diffs)
• lib/ui/src/promptdialog.c (added)
• lib/ui/src/rbutton.c (modified) (view diffs)
• lib/ui/src/resource.c (modified) (view diffs)
• lib/ui/src/slider.c (modified) (view diffs)
• lib/ui/src/ui.c (modified) (view diffs)
• lib/ui/src/wdecor.c (modified) (view diffs)
• lib/ui/src/window.c (modified) (view diffs)
• lib/ui/test/checkbox.c (modified) (view diffs)
• lib/ui/test/control.c (modified) (view diffs)
• lib/ui/test/entry.c (modified) (view diffs)
• lib/ui/test/filedialog.c (added)
• lib/ui/test/main.c (modified) (view diffs)
• lib/ui/test/menu.c (modified) (view diffs)
• lib/ui/test/msgdialog.c (modified) (view diffs)
• lib/ui/test/paint.c (modified) (view diffs)
• lib/ui/test/promptdialog.c (added)
• lib/ui/test/rbutton.c (modified) (view diffs)
• lib/ui/test/slider.c (modified) (view diffs)
• lib/ui/test/window.c (modified) (view diffs)
• meson.build (modified) (view diffs)
• srv/hid/console/console.c (modified) (view diffs)
• srv/hid/display/display.c (modified) (view diffs)
• srv/hid/display/window.c (modified) (view diffs)
• srv/hid/input/input.c (modified) (view diffs)
• srv/hid/output/meson.build (modified) (view diffs)
• srv/hid/output/port/chardev.c (modified) (view diffs)
• srv/hid/output/port/ega.c (modified) (view diffs)
• srv/hid/output/proto/vt100.c (modified) (view diffs)
• srv/net/dhcp/dhcp.c (modified) (view diffs)
• srv/net/ethip/arp.c (modified) (view diffs)
• srv/net/ethip/arp.h (modified) (view diffs)
• srv/net/ethip/atrans.c (modified) (view diffs)
• srv/net/ethip/atrans.h (modified) (view diffs)
• srv/net/ethip/ethip.c (modified) (view diffs)
• srv/net/ethip/ethip.h (modified) (view diffs)
• srv/net/ethip/ethip_nic.c (modified) (view diffs)
• srv/net/ethip/pdu.c (modified) (view diffs)
• srv/net/ethip/pdu.h (modified) (view diffs)
• srv/net/ethip/std.h (modified) (view diffs)
• srv/net/inetsrv/addrobj.c (modified) (view diffs)
• srv/net/inetsrv/inet_link.c (modified) (view diffs)
• srv/net/inetsrv/inet_link.h (modified) (view diffs)
• srv/net/inetsrv/inetcfg.c (modified) (view diffs)
• srv/net/inetsrv/inetsrv.h (modified) (view diffs)
• srv/net/inetsrv/ndp.c (modified) (view diffs)
• srv/net/inetsrv/ndp.h (modified) (view diffs)
• srv/net/inetsrv/ntrans.c (modified) (view diffs)
• srv/net/inetsrv/ntrans.h (modified) (view diffs)
• srv/net/inetsrv/pdu.c (modified) (view diffs)
• srv/net/loopip/loopip.c (modified) (view diffs)
• srv/net/slip/slip.c (modified) (view diffs)