Changeset 925a21e in mainline for boot/arch/ia64/src/sal.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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.

File:

• boot/arch/ia64/src/sal.c (moved) (moved from uspace/app/tester/devs/devman2.c ) (2 diffs)

boot/arch/ia64/src/sal.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup tester
- * @brief Test devman service.
- * @{
- */
-/**
- * @file
- */
+#include <arch/sal.h>
+#include <arch/types.h>
 
-#include <inttypes.h>
-#include <errno.h>
-#include <str_error.h>
-#include <sys/types.h>
-#include <async.h>
-#include <devman.h>
-#include <str.h>
-#include <async.h>
-#include <vfs/vfs.h>
-#include <vfs/vfs_sess.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include "../tester.h"
+static sal_ap_wakeup_desc_t *sal_ap_wakeup;
 
-#define DEVICE_CLASS "test3"
+extern uint64_t pal_proc;
 
-const char *test_devman2(void)
+uint64_t sal_proc = 0;
+uint64_t sal_proc_gp = 0;
+
+void sal_system_table_parse(sal_system_table_header_t *sst)
 {
-        size_t idx = 1;
-        int rc = EOK;
-        const char *err_msg = NULL;
-        char *path = NULL;
-        while (rc == EOK) {
-                rc = asprintf(&path, "/dev/class/%s\\%zu", DEVICE_CLASS, idx);
-                if (rc < 0) {
-                        continue;
+        uint8_t *cur = (uint8_t *) &sst[1];
+        uint16_t entry;
+
+        for (entry = 0; entry < sst->entry_count; entry++) {
+                switch ((sal_sst_type_t) *cur) {
+                case SSTT_ENTRYPOINT_DESC:
+                        pal_proc = ((sal_entrypoint_desc_t *) cur)->pal_proc;
+                        sal_proc = ((sal_entrypoint_desc_t *) cur)->sal_proc;
+                        sal_proc_gp = ((sal_entrypoint_desc_t *) cur)->sal_proc_gp;
+                        cur += sizeof(sal_entrypoint_desc_t);
+                        break;
+                case SSTT_MEMORY_DESC:
+                        cur += sizeof(sal_memory_desc_t);
+                        break;
+                case SSTT_PLATFORM_FEATURES_DESC:
+                        cur += sizeof(sal_platform_features_desc_t);
+                        break;
+                case SSTT_TR_DESC:
+                        cur += sizeof(sal_tr_desc_t);
+                        break;
+                case SSTT_PTC_COHERENCE_DOMAIN_DESC:
+                        cur += sizeof(sal_ptc_coherence_domain_desc_t);
+                        break;
+                case SSTT_AP_WAKEUP_DESC:
+                        sal_ap_wakeup = (sal_ap_wakeup_desc_t *) cur;
+                        cur += sizeof(sal_ap_wakeup_desc_t);
+                        break;
+                default:
+                        return;
                 }
-                int fd = open(path, O_RDONLY);
-                if (fd < 0) {
-                        TPRINTF("Failed opening `%s': %s.\n",
-                            path, str_error(fd));
-                        rc = fd;
-                        err_msg = "Failed opening file";
-                        continue;
-                }
-                async_sess_t *sess = fd_session(EXCHANGE_SERIALIZE, fd);
-                close(fd);
-                if (sess == NULL) {
-                        TPRINTF("Failed opening phone: %s.\n", str_error(errno));
-                        rc = errno;
-                        err_msg = "Failed opening file descriptor phone";
-                        continue;
-                }
-                async_hangup(sess);
-                TPRINTF("Path `%s' okay.\n", path);
-                free(path);
-                idx++;
-                rc = EOK;
         }
-        
-        if (path != NULL)
-                free(path);
-        
-        return err_msg;
 }
 
-/** @}
- */
+uint64_t sal_base_clock_frequency(void)
+{
+        uint64_t freq;
+        
+        sal_call_1_1(SAL_FREQ_BASE, 0, &freq);
+        
+        return freq;
+}