Changeset b0b4592e in mainline for kernel/genarch/src/drivers/grlib/irqmp.c

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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:

• kernel/genarch/src/drivers/grlib/irqmp.c (moved) (moved from uspace/lib/c/generic/device/battery_dev.c ) (2 diffs)

kernel/genarch/src/drivers/grlib/irqmp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Maurizio Lombardi
+ * Copyright (c) 2013 Jakub Klama
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup libc
+/** @addtogroup genarch
  * @{
  */
-/** @file
+/**
+ * @file
+ * @brief Gaisler GRLIB interrupt controller.
  */
 
-#include <ipc/dev_iface.h>
-#include <device/battery_dev.h>
-#include <errno.h>
-#include <async.h>
-#include <time.h>
+#include <genarch/drivers/grlib/irqmp.h>
+#include <arch/asm.h>
+#include <mm/km.h>
 
-/** Read the current battery status from the device
- *
- * @param sess     Session of the device
- * @param status   Current status of the battery
- *
- * @return         EOK on success or a negative error code
- */
-int
-battery_status_get(async_sess_t *sess, battery_status_t *batt_status)
+void grlib_irqmp_init(grlib_irqmp_t *irqc, bootinfo_t *bootinfo)
 {
-        sysarg_t status;
-
-        async_exch_t *exch = async_exchange_begin(sess);
-
-        int const rc = async_req_1_1(exch, DEV_IFACE_ID(BATTERY_DEV_IFACE),
-            BATTERY_STATUS_GET, &status);
-
-        async_exchange_end(exch);
-
-        if (rc == EOK)
-                *batt_status = (battery_status_t) status;
-
-        return rc;
+        irqc->regs = (void *) km_map(bootinfo->intc_base, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
+        
+        /* Clear all pending interrupts */
+        pio_write_32(&irqc->regs->clear, 0xffffffff);
+        
+        /* Mask all interrupts */
+        pio_write_32((void *) irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0);
 }
 
-/** Read the current battery charge level from the device
- *
- * @param sess     Session of the device
- * @param level    Battery charge level (0 - 100)
- *
- * @return         EOK on success or a negative error code
- */
-int
-battery_charge_level_get(async_sess_t *sess, int *level)
+int grlib_irqmp_inum_get(grlib_irqmp_t *irqc)
 {
-        sysarg_t charge_level;
+        uint32_t pending = pio_read_32(&irqc->regs->pending);
+        
+        for (unsigned int i = 1; i < 16; i++) {
+                if (pending & (1 << i))
+                        return i;
+        }
+        
+        return -1;
+}
 
-        async_exch_t *exch = async_exchange_begin(sess);
+void grlib_irqmp_clear(grlib_irqmp_t *irqc, unsigned int inum)
+{
+        pio_write_32(&irqc->regs->clear, (1 << inum));
+}
 
-        int const rc = async_req_1_1(exch, DEV_IFACE_ID(BATTERY_DEV_IFACE),
-            BATTERY_CHARGE_LEVEL_GET, &charge_level);
+void grlib_irqmp_mask(grlib_irqmp_t *irqc, unsigned int src)
+{
+        uint32_t mask = pio_read_32((void *) irqc->regs +
+            GRLIB_IRQMP_MASK_OFFSET);
+        
+        mask &= ~(1 << src);
+        pio_write_32((void *) irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
+}
 
-        async_exchange_end(exch);
-
-        if (rc == EOK)
-                *level = (int) charge_level;
-
-        return rc;
+void grlib_irqmp_unmask(grlib_irqmp_t *irqc, unsigned int src)
+{
+        uint32_t mask = pio_read_32((void *) irqc->regs +
+            GRLIB_IRQMP_MASK_OFFSET);
+        
+        mask |= (1 << src);
+        pio_write_32((void *) irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
 }
 
 /** @}
  */
-