Changeset 19b3cc6 in mainline for uspace/app/kio/kio.c

Timestamp:

2014-01-17T23:12:10Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e26a9d95

Parents:

fddffb2 (diff), facc34d (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:

Merge libdrv-cleanup branch (includes mainline changes)

File:

• uspace/app/kio/kio.c (moved) (moved from uspace/app/klog/klog.c ) (14 diffs)

uspace/app/kio/kio.c

@@ -27 +27 @@
  */
 
-/** @addtogroup klog KLog
- * @brief HelenOS KLog
+/** @addtogroup kio KIO
+ * @brief HelenOS KIO
  * @{
  */
@@ -42 +42 @@
 #include <errno.h>
 #include <str_error.h>
-#include <io/klog.h>
+#include <io/kio.h>
 #include <sysinfo.h>
 #include <malloc.h>
@@ -50 +50 @@
 #include <tinput.h>
 
-#define NAME       "klog"
-#define LOG_FNAME  "/log/klog"
+#define NAME       "kio"
+#define LOG_FNAME  "/log/kio"
 
 /* Producer/consumer buffers */
@@ -62 +62 @@
 static prodcons_t pc;
 
-/* Pointer to klog area */
-static wchar_t *klog;
-static size_t klog_length;
+/* Pointer to kio area */
+static wchar_t *kio;
+static size_t kio_length;
 
 /* Notification mutex */
@@ -75 +75 @@
  *
  * @param length Number of characters to copy.
- * @param data   Pointer to the kernel klog buffer.
+ * @param data   Pointer to the kernel kio buffer.
  *
  */
@@ -142 +142 @@
 /** Kernel notification handler
  *
- * Receives kernel klog notifications.
+ * Receives kernel kio notifications.
  *
  * @param callid IPC call ID
@@ -156 +156 @@
          * starving.
          *
-         * Note: Usually the automatic masking of the klog
+         * Note: Usually the automatic masking of the kio
          * notifications on the kernel side does the trick
          * of limiting the chance of accidentally copying
          * the same data multiple times. However, due to
-         * the non-blocking architecture of klog notifications,
+         * the non-blocking architecture of kio notifications,
          * this possibility cannot be generally avoided.
          */
@@ -166 +166 @@
         fibril_mutex_lock(&mtx);
         
-        size_t klog_start = (size_t) IPC_GET_ARG1(*call);
-        size_t klog_len = (size_t) IPC_GET_ARG2(*call);
-        size_t klog_stored = (size_t) IPC_GET_ARG3(*call);
-        
-        size_t offset = (klog_start + klog_len - klog_stored) % klog_length;
+        size_t kio_start = (size_t) IPC_GET_ARG1(*call);
+        size_t kio_len = (size_t) IPC_GET_ARG2(*call);
+        size_t kio_stored = (size_t) IPC_GET_ARG3(*call);
+        
+        size_t offset = (kio_start + kio_len - kio_stored) % kio_length;
         
         /* Copy data from the ring buffer */
-        if (offset + klog_stored >= klog_length) {
-                size_t split = klog_length - offset;
-                
-                producer(split, klog + offset);
-                producer(klog_stored - split, klog);
+        if (offset + kio_stored >= kio_length) {
+                size_t split = kio_length - offset;
+                
+                producer(split, kio + offset);
+                producer(kio_stored - split, kio);
         } else
-                producer(klog_stored, klog + offset);
-        
-        event_unmask(EVENT_KLOG);
+                producer(kio_stored, kio + offset);
+        
+        event_unmask(EVENT_KIO);
         fibril_mutex_unlock(&mtx);
 }
@@ -188 +188 @@
 {
         size_t pages;
-        int rc = sysinfo_get_value("klog.pages", &pages);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to get number of klog pages\n",
+        int rc = sysinfo_get_value("kio.pages", &pages);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to get number of kio pages\n",
                     NAME);
                 return rc;
@@ -196 +196 @@
         
         uintptr_t faddr;
-        rc = sysinfo_get_value("klog.faddr", &faddr);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to get klog physical address\n",
+        rc = sysinfo_get_value("kio.faddr", &faddr);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to get kio physical address\n",
                     NAME);
                 return rc;
@@ -204 +204 @@
         
         size_t size = pages * PAGE_SIZE;
-        klog_length = size / sizeof(wchar_t);
+        kio_length = size / sizeof(wchar_t);
         
         rc = physmem_map(faddr, pages, AS_AREA_READ | AS_AREA_CACHEABLE,
-            (void *) &klog);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to map klog\n", NAME);
+            (void *) &kio);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to map kio\n", NAME);
                 return rc;
         }
@@ -215 +215 @@
         prodcons_initialize(&pc);
         async_set_interrupt_received(notification_received);
-        rc = event_subscribe(EVENT_KLOG, 0);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to register klog notifications\n",
+        rc = event_subscribe(EVENT_KIO, 0);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to register kio notifications\n",
                     NAME);
                 return rc;
@@ -236 +236 @@
 
         fibril_add_ready(fid);
-        event_unmask(EVENT_KLOG);
-        klog_update();
-        
-        tinput_set_prompt(input, "klog> ");
+        event_unmask(EVENT_KIO);
+        kio_update();
+        
+        tinput_set_prompt(input, "kio> ");
 
         char *str;
@@ -248 +248 @@
                 }
 
-                klog_command(str, str_size(str));
+                kio_command(str, str_size(str));
                 free(str);
         }