Changeset 96b02eb9 in mainline for kernel/generic/src/ddi

Timestamp:

2010-12-14T12:52:38Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

Location:

kernel/generic/src/ddi

Files:

• ddi.c (modified) (3 diffs)
• device.c (modified) (1 diff)
• irq.c (modified) (9 diffs)

kernel/generic/src/ddi/ddi.c

@@ -232 +232 @@
  *
  */
-unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base,
-    unative_t pages, unative_t flags)
-{
-        return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
+sysarg_t sys_physmem_map(sysarg_t phys_base, sysarg_t virt_base,
+    sysarg_t pages, sysarg_t flags)
+{
+        return (sysarg_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
             FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
             (size_t) pages, (int) flags);
@@ -247 +247 @@
  *
  */
-unative_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
+sysarg_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
 {
         ddi_ioarg_t arg;
         int rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
         if (rc != 0)
-                return (unative_t) rc;
-        
-        return (unative_t) ddi_iospace_enable((task_id_t) arg.task_id,
+                return (sysarg_t) rc;
+        
+        return (sysarg_t) ddi_iospace_enable((task_id_t) arg.task_id,
             (uintptr_t) arg.ioaddr, (size_t) arg.size);
 }
@@ -265 +265 @@
  * @retutn Zero on success, error code otherwise.
  */
-unative_t sys_interrupt_enable(int irq, int enable)
+sysarg_t sys_interrupt_enable(int irq, int enable)
 {
 /* FIXME: this needs to be generic code, or better not be in kernel at all. */

kernel/generic/src/ddi/device.c

@@ -54 +54 @@
 }
 
-unative_t sys_device_assign_devno(void)
+sysarg_t sys_device_assign_devno(void)
 {
-        return (unative_t) device_assign_devno();
+        return (sysarg_t) device_assign_devno();
 }
 

kernel/generic/src/ddi/irq.c

@@ -106 +106 @@
  *
  */
-static size_t irq_ht_hash(unative_t *key);
-static bool irq_ht_compare(unative_t *key, size_t keys, link_t *item);
+static size_t irq_ht_hash(sysarg_t *key);
+static bool irq_ht_compare(sysarg_t *key, size_t keys, link_t *item);
 static void irq_ht_remove(link_t *item);
 
@@ -123 +123 @@
  *
  */
-static size_t irq_lin_hash(unative_t *key);
-static bool irq_lin_compare(unative_t *key, size_t keys, link_t *item);
+static size_t irq_lin_hash(sysarg_t *key);
+static bool irq_lin_compare(sysarg_t *key, size_t keys, link_t *item);
 static void irq_lin_remove(link_t *item);
 
@@ -194 +194 @@
 void irq_register(irq_t *irq)
 {
-        unative_t key[] = {
-                (unative_t) irq->inr,
-                (unative_t) irq->devno
+        sysarg_t key[] = {
+                (sysarg_t) irq->inr,
+                (sysarg_t) irq->devno
         };
         
@@ -212 +212 @@
 {
         link_t *lnk;
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) -1    /* Search will use claim() instead of devno */
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) -1    /* Search will use claim() instead of devno */
         };
         
@@ -235 +235 @@
 {
         link_t *lnk;
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) -1    /* Search will use claim() instead of devno */
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) -1    /* Search will use claim() instead of devno */
         };
         
@@ -306 +306 @@
  *
  */
-size_t irq_ht_hash(unative_t key[])
+size_t irq_ht_hash(sysarg_t key[])
 {
         inr_t inr = (inr_t) key[KEY_INR];
@@ -333 +333 @@
  *
  */
-bool irq_ht_compare(unative_t key[], size_t keys, link_t *item)
+bool irq_ht_compare(sysarg_t key[], size_t keys, link_t *item)
 {
         irq_t *irq = hash_table_get_instance(item, irq_t, link);
@@ -381 +381 @@
  *
  */
-size_t irq_lin_hash(unative_t key[])
+size_t irq_lin_hash(sysarg_t key[])
 {
         inr_t inr = (inr_t) key[KEY_INR];
@@ -408 +408 @@
  *
  */
-bool irq_lin_compare(unative_t key[], size_t keys, link_t *item)
+bool irq_lin_compare(sysarg_t key[], size_t keys, link_t *item)
 {
         irq_t *irq = list_get_instance(item, irq_t, link);