Changeset d5a89a3 in mainline for uspace/srv

Timestamp:

2019-02-11T22:31:04Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (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:

merging with upstream/master

Location:

uspace/srv

Files:

• devman/main.c (modified) (3 diffs)
• fs/locfs/locfs_ops.c (modified) (2 diffs)
• fs/udf/udf_ops.c (modified) (1 diff)
• hid/input/ctl/stty.c (modified) (1 diff)
• hid/input/stroke.c (modified) (1 diff)
• hid/isdv4_tablet/isdv4.c (modified) (1 diff)
• locsrv/locsrv.c (modified) (2 diffs)
• net/inetsrv/icmp.c (modified) (1 diff)
• net/inetsrv/icmpv6.c (modified) (1 diff)
• net/inetsrv/pdu.c (modified) (1 diff)
• ns/clonable.c (modified) (1 diff)
• ns/service.c (modified) (1 diff)
• vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/devman/main.c

@@ -136 +136 @@
 
         async_exch_t *exch = async_exchange_begin(driver->sess);
-        async_forward_fast(icall, exch, INTERFACE_DDF_CLIENT, handle, 0, IPC_FF_NONE);
+        async_forward_1(icall, exch, INTERFACE_DDF_CLIENT, handle, IPC_FF_NONE);
         async_exchange_end(exch);
 
@@ -215 +215 @@
 
         async_exch_t *exch = async_exchange_begin(driver->sess);
-        async_forward_fast(icall, exch, INTERFACE_DDF_DRIVER, fun_handle, 0, IPC_FF_NONE);
+        async_forward_1(icall, exch, INTERFACE_DDF_DRIVER, fun_handle, IPC_FF_NONE);
         async_exchange_end(exch);
 
@@ -250 +250 @@
 
         async_exch_t *exch = async_exchange_begin(driver->sess);
-        async_forward_fast(icall, exch, iface, handle, 0, IPC_FF_NONE);
+        async_forward_1(icall, exch, iface, handle, IPC_FF_NONE);
         async_exchange_end(exch);
 

uspace/srv/fs/locfs/locfs_ops.c

@@ -583 +583 @@
 
                 /* Forward the IPC_M_DATA_READ request to the driver */
-                async_forward_fast(&call, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+                async_forward_0(&call, exch, 0, IPC_FF_ROUTE_FROM_ME);
 
                 async_exchange_end(exch);
@@ -647 +647 @@
 
                 /* Forward the IPC_M_DATA_WRITE request to the driver */
-                async_forward_fast(&call, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+                async_forward_0(&call, exch, 0, IPC_FF_ROUTE_FROM_ME);
 
                 async_exchange_end(exch);

uspace/srv/fs/udf/udf_ops.c

@@ -62 +62 @@
 #include "udf_osta.h"
 
-/** Mutex protecting the list of cached free nodes. */
-static FIBRIL_MUTEX_INITIALIZE(ffn_mutex);
-
 /** List of cached free nodes. */
 static LIST_INITIALIZE(ffn_list);

uspace/srv/hid/input/ctl/stty.c

@@ -228 +228 @@
         0,      KC_RIGHT,       0x1b, 0x5b, 0x43, GSP_END,
 
+        KM_CTRL,        KC_Q,           0x11, GSP_END,
+        KM_CTRL,        KC_W,           0x17, GSP_END,
+        KM_CTRL,        KC_E,           0x05, GSP_END,
+        KM_CTRL,        KC_R,           0x12, GSP_END,
+        KM_CTRL,        KC_T,           0x14, GSP_END,
+        KM_CTRL,        KC_Y,           0x19, GSP_END,
+        KM_CTRL,        KC_U,           0x15, GSP_END,
+        KM_CTRL,        KC_O,           0x0f, GSP_END,
+        KM_CTRL,        KC_P,           0x10, GSP_END,
+
+        KM_CTRL,        KC_A,           0x01, GSP_END,
+        KM_CTRL,        KC_S,           0x13, GSP_END,
+        KM_CTRL,        KC_D,           0x04, GSP_END,
+        KM_CTRL,        KC_F,           0x06, GSP_END,
+        KM_CTRL,        KC_G,           0x07, GSP_END,
+        KM_CTRL,        KC_K,           0x0b, GSP_END,
+        KM_CTRL,        KC_L,           0x0c, GSP_END,
+
+        KM_CTRL,        KC_Z,           0x1a, GSP_END,
+        KM_CTRL,        KC_X,           0x18, GSP_END,
+        KM_CTRL,        KC_C,           0x03, GSP_END,
+        KM_CTRL,        KC_V,           0x16, GSP_END,
+        KM_CTRL,        KC_B,           0x02, GSP_END,
+        KM_CTRL,        KC_N,           0x0e, GSP_END,
+
         /*
          * Sequences specific to Gnome terminal

uspace/srv/hid/input/stroke.c

@@ -48 +48 @@
 static unsigned int mods_keys[][2] = {
         { KM_LSHIFT, KC_LSHIFT },
+        { KM_LCTRL, KC_LCTRL },
         { 0, 0 }
 };

uspace/srv/hid/isdv4_tablet/isdv4.c

@@ -27 +27 @@
  */
 
-#include <async.h>
 #include <errno.h>
+#include <fibril.h>
 #include <io/chardev.h>
 #include <mem.h>

uspace/srv/locsrv/locsrv.c

@@ -726 +726 @@
 
         async_exch_t *exch = async_exchange_begin(svc->server->sess);
-        async_forward_fast(call, exch, iface, svc->id, 0, IPC_FF_NONE);
+        async_forward_1(call, exch, iface, svc->id, IPC_FF_NONE);
         async_exchange_end(exch);
 
@@ -1409 +1409 @@
          */
         static_assert((INTERFACE_LOC_SUPPLIER & IFACE_EXCHANGE_MASK) ==
-            IFACE_EXCHANGE_SERIALIZE);
+            IFACE_EXCHANGE_SERIALIZE, "");
 
         loc_server_t *server = loc_server_register();

uspace/srv/net/inetsrv/icmp.c

@@ -133 +133 @@
         sdu.dest = dgram->dest;
         sdu.seq_no = uint16_t_be2host(reply->seq_no);
-        sdu.data = reply + sizeof(icmp_echo_t);
+        sdu.data = dgram->data + sizeof(icmp_echo_t);
         sdu.size = dgram->size - sizeof(icmp_echo_t);
 

uspace/srv/net/inetsrv/icmpv6.c

@@ -124 +124 @@
 
         sdu.seq_no = uint16_t_be2host(reply->un.echo.seq_no);
-        sdu.data = reply + sizeof(icmpv6_message_t);
+        sdu.data = dgram->data + sizeof(icmpv6_message_t);
         sdu.size = dgram->size - sizeof(icmpv6_message_t);
 

uspace/srv/net/inetsrv/pdu.c

@@ -224 +224 @@
                 return EINVAL;
 
-        static_assert(sizeof(ip6_header_t) % 8 == 0);
+        static_assert(sizeof(ip6_header_t) % 8 == 0, "");
         assert(hdr_size % 8 == 0);
         assert(offs % FRAG_OFFS_UNIT == 0);

uspace/srv/ns/clonable.c

@@ -94 +94 @@
 
         async_exch_t *exch = async_exchange_begin(sess);
-        async_forward_fast(&csr->call, exch, csr->iface,
-            IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
+        async_forward_1(&csr->call, exch, csr->iface,
+            IPC_GET_ARG3(csr->call), IPC_FF_NONE);
         async_exchange_end(exch);
 

uspace/srv/ns/service.c

@@ -154 +154 @@
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        async_forward_fast(call, exch, iface, IPC_GET_ARG3(*call), 0,
-            IPC_FF_NONE);
+        async_forward_1(call, exch, iface, IPC_GET_ARG3(*call), IPC_FF_NONE);
         async_exchange_end(exch);
 }

uspace/srv/vfs/vfs_ops.c

@@ -637 +637 @@
 
         async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-        errno_t rc = async_data_read_forward_fast(exch, VFS_OUT_STAT,
-            node->service_id, node->index, true, 0, NULL);
+        errno_t rc = async_data_read_forward_3_0(exch, VFS_OUT_STAT,
+            node->service_id, node->index, true);
         vfs_exchange_release(exch);
 
@@ -654 +654 @@
 
         async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-        errno_t rc = async_data_read_forward_fast(exch, VFS_OUT_STATFS,
-            node->service_id, node->index, false, 0, NULL);
+        errno_t rc = async_data_read_forward_3_0(exch, VFS_OUT_STATFS,
+            node->service_id, node->index, false);
         vfs_exchange_release(exch);