Changeset cf2af94 in mainline for uspace/srv/hw/irc/apic/apic.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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 mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/srv/hw/irc/apic/apic.c (moved) (moved from uspace/app/tester/ipc/register.c ) (3 diffs)

uspace/srv/hw/irc/apic/apic.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#include <inttypes.h>
+/** @addtogroup apic
+ * @{
+ */
+
+/**
+ * @file apic.c
+ * @brief APIC driver.
+ */
+
+#include <ipc/services.h>
+#include <ipc/irc.h>
+#include <ipc/ns.h>
+#include <sysinfo.h>
+#include <as.h>
+#include <ddi.h>
+#include <libarch/ddi.h>
+#include <align.h>
+#include <bool.h>
+#include <errno.h>
+#include <async.h>
+#include <align.h>
+#include <async.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <async.h>
-#include <errno.h>
-#include "../tester.h"
+#include <ipc/devmap.h>
 
-#define MAX_CONNECTIONS  50
+#define NAME  "apic"
 
-static int connections[MAX_CONNECTIONS];
+static int apic_enable_irq(sysarg_t irq)
+{
+        // FIXME: TODO
+        return ENOTSUP;
+}
 
-static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
+/** Handle one connection to APIC.
+ *
+ * @param iid   Hash of the request that opened the connection.
+ * @param icall Call data of the request that opened the connection.
+ *
+ */
+static void apic_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-        unsigned int i;
+        ipc_callid_t callid;
+        ipc_call_t call;
         
-        TPRINTF("Connected phone %" PRIun " accepting\n", icall->in_phone_hash);
-        ipc_answer_0(iid, EOK);
-        for (i = 0; i < MAX_CONNECTIONS; i++) {
-                if (!connections[i]) {
-                        connections[i] = icall->in_phone_hash;
-                        break;
-                }
-        }
+        /*
+         * Answer the first IPC_M_CONNECT_ME_TO call.
+         */
+        async_answer_0(iid, EOK);
         
         while (true) {
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                int retval;
+                callid = async_get_call(&call);
                 
-                switch (IPC_GET_METHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        TPRINTF("Phone %" PRIun " hung up\n", icall->in_phone_hash);
-                        retval = 0;
+                switch (IPC_GET_IMETHOD(call)) {
+                case IRC_ENABLE_INTERRUPT:
+                        async_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call)));
                         break;
-                case IPC_TEST_METHOD:
-                        TPRINTF("Received well known message from %" PRIun ": %" PRIun "\n",
-                            icall->in_phone_hash, callid);
-                        ipc_answer_0(callid, EOK);
+                case IRC_CLEAR_INTERRUPT:
+                        /* Noop */
+                        async_answer_0(callid, EOK);
                         break;
                 default:
-                        TPRINTF("Received unknown message from %" PRIun ": %" PRIun "\n",
-                            icall->in_phone_hash, callid);
-                        ipc_answer_0(callid, ENOENT);
+                        async_answer_0(callid, EINVAL);
                         break;
                 }
@@ -75 +94 @@
 }
 
-const char *test_register(void)
+/** Initialize the APIC driver.
+ *
+ */
+static bool apic_init(void)
 {
-        async_set_client_connection(client_connection);
+        sysarg_t apic;
         
-        ipcarg_t phonead;
-        int res = ipc_connect_to_me(PHONE_NS, IPC_TEST_SERVICE, 0, 0, &phonead);
-        if (res != 0)
-                return "Failed registering IPC service";
+        if ((sysinfo_get_value("apic", &apic) != EOK) || (!apic)) {
+                printf(NAME ": No APIC found\n");
+                return false;
+        }
         
-        TPRINTF("Registered as service %u, accepting connections\n", IPC_TEST_SERVICE);
+        async_set_client_connection(apic_connection);
+        service_register(SERVICE_APIC);
+        
+        return true;
+}
+
+int main(int argc, char **argv)
+{
+        printf(NAME ": HelenOS APIC driver\n");
+        
+        if (!apic_init())
+                return -1;
+        
+        printf(NAME ": Accepting connections\n");
         async_manager();
         
-        return NULL;
+        /* Never reached */
+        return 0;
 }
+
+/**
+ * @}
+ */