Changeset d7dfa05 in mainline for kernel/generic/src

Timestamp:

2019-06-20T14:07:25Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

5acf533

Parents:

64b7854

Message:

Make the types ccheck-safe

Instead of using uspace_ptr(char), use uspace_ptr_char which is
defined as #define uspace_ptr_char uspace_ptr(char).

Location:

kernel/generic/src

Files:

• ddi/ddi.c (modified) (2 diffs)
• ipc/irq.c (modified) (2 diffs)
• ipc/sysipc.c (modified) (6 diffs)
• log/log.c (modified) (1 diff)
• mm/as.c (modified) (2 diffs)
• mm/page.c (modified) (1 diff)
• proc/program.c (modified) (1 diff)
• proc/task.c (modified) (3 diffs)
• proc/thread.c (modified) (2 diffs)
• security/perm.c (modified) (2 diffs)
• synch/syswaitq.c (modified) (1 diff)
• sysinfo/sysinfo.c (modified) (2 diffs)

kernel/generic/src/ddi/ddi.c

@@ -393 +393 @@
  *
  */
-sys_errno_t sys_iospace_enable(uspace_ptr(ddi_ioarg_t) uspace_io_arg)
+sys_errno_t sys_iospace_enable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
         ddi_ioarg_t arg;
@@ -404 +404 @@
 }
 
-sys_errno_t sys_iospace_disable(uspace_ptr(ddi_ioarg_t) uspace_io_arg)
+sys_errno_t sys_iospace_disable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
         ddi_ioarg_t arg;

kernel/generic/src/ipc/irq.c

@@ -223 +223 @@
  *
  */
-static irq_code_t *code_from_uspace(uspace_ptr(irq_code_t) ucode)
+static irq_code_t *code_from_uspace(uspace_ptr_irq_code_t ucode)
 {
         irq_pio_range_t *ranges = NULL;
@@ -323 +323 @@
  */
 errno_t ipc_irq_subscribe(answerbox_t *box, inr_t inr, sysarg_t imethod,
-    uspace_ptr(irq_code_t) ucode, uspace_ptr(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))

kernel/generic/src/ipc/sysipc.c

@@ -419 +419 @@
  *
  */
-sys_errno_t sys_ipc_call_async_slow(cap_phone_handle_t handle, uspace_ptr(ipc_data_t) data,
+sys_errno_t sys_ipc_call_async_slow(cap_phone_handle_t handle, uspace_ptr_ipc_data_t data,
     sysarg_t label)
 {
@@ -623 +623 @@
  */
 sys_errno_t sys_ipc_forward_slow(cap_call_handle_t chandle,
-    cap_phone_handle_t phandle, uspace_ptr(ipc_data_t) data, unsigned int mode)
+    cap_phone_handle_t phandle, uspace_ptr_ipc_data_t data, unsigned int mode)
 {
         ipc_data_t newdata;
@@ -700 +700 @@
  *
  */
-sys_errno_t sys_ipc_answer_slow(cap_call_handle_t chandle, uspace_ptr(ipc_data_t) data)
+sys_errno_t sys_ipc_answer_slow(cap_call_handle_t chandle, uspace_ptr_ipc_data_t data)
 {
         kobject_t *kobj = cap_unpublish(TASK, chandle, KOBJECT_TYPE_CALL);
@@ -766 +766 @@
  * @return An error code on error.
  */
-sys_errno_t sys_ipc_wait_for_call(uspace_ptr(ipc_data_t) calldata, uint32_t usec,
+sys_errno_t sys_ipc_wait_for_call(uspace_ptr_ipc_data_t calldata, uint32_t usec,
     unsigned int flags)
 {
@@ -888 +888 @@
  */
 sys_errno_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod,
-    uspace_ptr(irq_code_t) ucode, uspace_ptr(cap_irq_handle_t) uspace_handle)
+    uspace_ptr_irq_code_t ucode, uspace_ptr_cap_irq_handle_t uspace_handle)
 {
         if (!(perm_get(TASK) & PERM_IRQ_REG))
@@ -918 +918 @@
  *
  */
-sys_errno_t sys_ipc_connect_kbox(uspace_ptr(task_id_t) uspace_taskid,
-    uspace_ptr(cap_phone_handle_t) uspace_phone)
+sys_errno_t sys_ipc_connect_kbox(uspace_ptr_task_id_t uspace_taskid,
+    uspace_ptr_cap_phone_handle_t uspace_phone)
 {
 #ifdef CONFIG_UDEBUG

kernel/generic/src/log/log.c

@@ -296 +296 @@
  */
 sys_errno_t sys_klog(sysarg_t operation, uspace_addr_t buf, size_t size,
-    sysarg_t level, uspace_ptr(size_t) uspace_nread)
+    sysarg_t level, uspace_ptr_size_t uspace_nread)
 {
         char *data;

kernel/generic/src/mm/as.c

@@ -2092 +2092 @@
 
 sysarg_t sys_as_area_create(uintptr_t base, size_t size, unsigned int flags,
-    uintptr_t bound, uspace_ptr(as_area_pager_info_t) pager_info)
+    uintptr_t bound, uspace_ptr_as_area_pager_info_t pager_info)
 {
         uintptr_t virt = base;
@@ -2125 +2125 @@
 }
 
-sys_errno_t sys_as_area_get_info(uintptr_t address, uspace_ptr(as_area_info_t) dest)
+sys_errno_t sys_as_area_get_info(uintptr_t address, uspace_ptr_as_area_info_t dest)
 {
         as_area_t *area;

kernel/generic/src/mm/page.c

@@ -215 +215 @@
  *
  */
-sys_errno_t sys_page_find_mapping(uintptr_t virt, uspace_ptr(uintptr_t) phys_ptr)
+sys_errno_t sys_page_find_mapping(uintptr_t virt, uspace_ptr_uintptr_t phys_ptr)
 {
         uintptr_t phys;

kernel/generic/src/proc/program.c

@@ -218 +218 @@
  *
  */
-sys_errno_t sys_program_spawn_loader(uspace_ptr(char) uspace_name, size_t name_len)
+sys_errno_t sys_program_spawn_loader(uspace_ptr_char uspace_name, size_t name_len)
 {
         /* Cap length of name and copy it from userspace. */

kernel/generic/src/proc/task.c

@@ -323 +323 @@
  *
  */
-sys_errno_t sys_task_get_id(uspace_ptr(sysarg64_t) uspace_taskid)
+sys_errno_t sys_task_get_id(uspace_ptr_sysarg64_t uspace_taskid)
 {
         /*
@@ -363 +363 @@
  *
  */
-sys_errno_t sys_task_set_name(const uspace_ptr(char) uspace_name, size_t name_len)
+sys_errno_t sys_task_set_name(const uspace_ptr_char uspace_name, size_t name_len)
 {
         char namebuf[TASK_NAME_BUFLEN];
@@ -404 +404 @@
  *
  */
-sys_errno_t sys_task_kill(uspace_ptr(task_id_t) uspace_taskid)
+sys_errno_t sys_task_kill(uspace_ptr_task_id_t uspace_taskid)
 {
         task_id_t taskid;

kernel/generic/src/proc/thread.c

@@ -998 +998 @@
  *
  */
-sys_errno_t sys_thread_create(uspace_ptr(uspace_arg_t) uspace_uarg, uspace_ptr(char) uspace_name,
-    size_t name_len, uspace_ptr(thread_id_t) uspace_thread_id)
+sys_errno_t sys_thread_create(uspace_ptr_uspace_arg_t uspace_uarg, uspace_ptr_char uspace_name,
+    size_t name_len, uspace_ptr_thread_id_t uspace_thread_id)
 {
         if (name_len > THREAD_NAME_BUFLEN - 1)
@@ -1088 +1088 @@
  *
  */
-sys_errno_t sys_thread_get_id(uspace_ptr(thread_id_t) uspace_thread_id)
+sys_errno_t sys_thread_get_id(uspace_ptr_thread_id_t uspace_thread_id)
 {
         /*

kernel/generic/src/security/perm.c

@@ -158 +158 @@
  *
  */
-sys_errno_t sys_perm_grant(uspace_ptr(sysarg64_t) uspace_taskid, perm_t perms)
+sys_errno_t sys_perm_grant(uspace_ptr_sysarg64_t uspace_taskid, perm_t perms)
 {
         sysarg64_t taskid;
@@ -179 +179 @@
  *
  */
-sys_errno_t sys_perm_revoke(uspace_ptr(sysarg64_t) uspace_taskid, perm_t perms)
+sys_errno_t sys_perm_revoke(uspace_ptr_sysarg64_t uspace_taskid, perm_t perms)
 {
         sysarg64_t taskid;

kernel/generic/src/synch/syswaitq.c

@@ -88 +88 @@
  * @return              Error code.
  */
-sys_errno_t sys_waitq_create(uspace_ptr(cap_waitq_handle_t) whandle)
+sys_errno_t sys_waitq_create(uspace_ptr_cap_waitq_handle_t whandle)
 {
         waitq_t *wq = slab_alloc(waitq_cache, FRAME_ATOMIC);

kernel/generic/src/sysinfo/sysinfo.c

@@ -880 +880 @@
  */
 sys_errno_t sys_sysinfo_get_keys(uspace_addr_t path_ptr, size_t path_size,
-    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
+    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr_size_t size_ptr)
 {
         errno_t rc;
@@ -1037 +1037 @@
  */
 sys_errno_t sys_sysinfo_get_data(uspace_addr_t path_ptr, size_t path_size,
-    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
+    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr_size_t size_ptr)
 {
         errno_t rc;