Changeset e28175d in mainline for kernel/generic/src/ipc/irq.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• kernel/generic/src/ipc/irq.c (modified) (6 diffs)

kernel/generic/src/ipc/irq.c

@@ -223 +223 @@
  *
  */
-static irq_code_t *code_from_uspace(irq_code_t *ucode)
+static irq_code_t *code_from_uspace(uspace_ptr_irq_code_t ucode)
 {
         irq_pio_range_t *ranges = NULL;
@@ -242 +242 @@
         if (!ranges)
                 goto error;
-        rc = copy_from_uspace(ranges, code->ranges,
+        rc = copy_from_uspace(ranges, (uintptr_t) code->ranges,
             sizeof(code->ranges[0]) * code->rangecount);
         if (rc != EOK)
@@ -250 +250 @@
         if (!cmds)
                 goto error;
-        rc = copy_from_uspace(cmds, code->cmds,
+        rc = copy_from_uspace(cmds, (uintptr_t) code->cmds,
             sizeof(code->cmds[0]) * code->cmdcount);
         if (rc != EOK)
@@ -306 +306 @@
 }
 
-static kobject_ops_t irq_kobject_ops = {
+kobject_ops_t irq_kobject_ops = {
         .destroy = irq_destroy
 };
@@ -323 +323 @@
  */
 errno_t ipc_irq_subscribe(answerbox_t *box, inr_t inr, sysarg_t imethod,
-    irq_code_t *ucode, cap_irq_handle_t *uspace_handle)
+    uspace_ptr_irq_code_t ucode, uspace_ptr_cap_irq_handle_t uspace_handle)
 {
         if ((inr < 0) || (inr > last_inr))
@@ -385 +385 @@
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
 
-        kobject_initialize(kobject, KOBJECT_TYPE_IRQ, irq, &irq_kobject_ops);
+        kobject_initialize(kobject, KOBJECT_TYPE_IRQ, irq);
         cap_publish(TASK, handle, kobject);