diff options
| author | Anuj Gangwar <anujg@nvidia.com> | 2019-05-09 23:51:33 -0400 |
|---|---|---|
| committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2019-05-10 09:44:00 -0400 |
| commit | 6f8da2ca9d5db9c4989859a4f8578eb9e24b1f4f (patch) | |
| tree | 1abfbf47260ef27d465e85124cd13b349f738ac4 /include/uapi | |
| parent | 5b1bd3b43c8c268618c666a553ecdfe699e8a549 (diff) | |
include: uapi: change the data type in headers
According kernel ABI proposal, user-space headers should have data
type like __u8, __u16, __u32, __u64 instead of u8, u16, u32, u64.
Bug 2062672
Change-Id: I3b5d09584efb0738f87f03c9d746bffec3d2a209
Signed-off-by: Anuj Gangwar <anujg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2116124
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/nvhost_events.h | 72 | ||||
| -rw-r--r-- | include/uapi/linux/nvhost_isp_ioctl.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/nvhost_pva_ioctl.h | 6 | ||||
| -rw-r--r-- | include/uapi/media/imx219.h | 10 | ||||
| -rw-r--r-- | include/uapi/media/ov10823.h | 10 | ||||
| -rw-r--r-- | include/uapi/misc/eqos_ape_ioctl.h | 4 | ||||
| -rw-r--r-- | include/uapi/misc/tegra_mipi_ioctl.h | 6 |
7 files changed, 55 insertions, 55 deletions
diff --git a/include/uapi/linux/nvhost_events.h b/include/uapi/linux/nvhost_events.h index 1c1fd7229..747130976 100644 --- a/include/uapi/linux/nvhost_events.h +++ b/include/uapi/linux/nvhost_events.h | |||
| @@ -28,109 +28,109 @@ enum { | |||
| 28 | /* Marks that the task is submitted to hardware */ | 28 | /* Marks that the task is submitted to hardware */ |
| 29 | struct nvhost_task_submit { | 29 | struct nvhost_task_submit { |
| 30 | /* Engine class ID */ | 30 | /* Engine class ID */ |
| 31 | u32 class_id; | 31 | __u32 class_id; |
| 32 | 32 | ||
| 33 | /* Syncpoint ID */ | 33 | /* Syncpoint ID */ |
| 34 | u32 syncpt_id; | 34 | __u32 syncpt_id; |
| 35 | 35 | ||
| 36 | /* Threshold for task completion */ | 36 | /* Threshold for task completion */ |
| 37 | u32 syncpt_thresh; | 37 | __u32 syncpt_thresh; |
| 38 | 38 | ||
| 39 | /* PID */ | 39 | /* PID */ |
| 40 | u32 pid; | 40 | __u32 pid; |
| 41 | 41 | ||
| 42 | /* TID */ | 42 | /* TID */ |
| 43 | u32 tid; | 43 | __u32 tid; |
| 44 | } __packed; | 44 | } __packed; |
| 45 | 45 | ||
| 46 | /* Marks that the task is moving to execution */ | 46 | /* Marks that the task is moving to execution */ |
| 47 | struct nvhost_task_begin { | 47 | struct nvhost_task_begin { |
| 48 | /* Engine class ID */ | 48 | /* Engine class ID */ |
| 49 | u32 class_id; | 49 | __u32 class_id; |
| 50 | 50 | ||
| 51 | /* Syncpoint ID */ | 51 | /* Syncpoint ID */ |
| 52 | u32 syncpt_id; | 52 | __u32 syncpt_id; |
| 53 | 53 | ||
| 54 | /* Threshold for task completion */ | 54 | /* Threshold for task completion */ |
| 55 | u32 syncpt_thresh; | 55 | __u32 syncpt_thresh; |
| 56 | } __packed; | 56 | } __packed; |
| 57 | 57 | ||
| 58 | /* Marks that the task is completed */ | 58 | /* Marks that the task is completed */ |
| 59 | struct nvhost_task_end { | 59 | struct nvhost_task_end { |
| 60 | /* Engine class ID */ | 60 | /* Engine class ID */ |
| 61 | u32 class_id; | 61 | __u32 class_id; |
| 62 | 62 | ||
| 63 | /* Syncpoint ID */ | 63 | /* Syncpoint ID */ |
| 64 | u32 syncpt_id; | 64 | __u32 syncpt_id; |
| 65 | 65 | ||
| 66 | /* Threshold for task completion */ | 66 | /* Threshold for task completion */ |
| 67 | u32 syncpt_thresh; | 67 | __u32 syncpt_thresh; |
| 68 | } __packed; | 68 | } __packed; |
| 69 | 69 | ||
| 70 | struct nvhost_vpu_perf_counter { | 70 | struct nvhost_vpu_perf_counter { |
| 71 | /* Engine class ID */ | 71 | /* Engine class ID */ |
| 72 | u32 class_id; | 72 | __u32 class_id; |
| 73 | 73 | ||
| 74 | /* Syncpoint ID */ | 74 | /* Syncpoint ID */ |
| 75 | u32 syncpt_id; | 75 | __u32 syncpt_id; |
| 76 | 76 | ||
| 77 | /* Threshold for task completion */ | 77 | /* Threshold for task completion */ |
| 78 | u32 syncpt_thresh; | 78 | __u32 syncpt_thresh; |
| 79 | 79 | ||
| 80 | /* Identifier for the R5/VPU algorithm executed */ | 80 | /* Identifier for the R5/VPU algorithm executed */ |
| 81 | u32 operation; | 81 | __u32 operation; |
| 82 | 82 | ||
| 83 | /* Algorithm specific identifying tag for the perf counter */ | 83 | /* Algorithm specific identifying tag for the perf counter */ |
| 84 | u32 tag; | 84 | __u32 tag; |
| 85 | 85 | ||
| 86 | u32 count; | 86 | __u32 count; |
| 87 | u32 average; | 87 | __u32 average; |
| 88 | u64 variance; | 88 | __u64 variance; |
| 89 | u32 minimum; | 89 | __u32 minimum; |
| 90 | u32 maximum; | 90 | __u32 maximum; |
| 91 | } __packed; | 91 | } __packed; |
| 92 | 92 | ||
| 93 | /* Marks the pre/postfence associated with the task */ | 93 | /* Marks the pre/postfence associated with the task */ |
| 94 | struct nvhost_task_fence { | 94 | struct nvhost_task_fence { |
| 95 | /* Engine class ID */ | 95 | /* Engine class ID */ |
| 96 | u32 class_id; | 96 | __u32 class_id; |
| 97 | 97 | ||
| 98 | /* Kind (prefence or postfence) */ | 98 | /* Kind (prefence or postfence) */ |
| 99 | u32 kind; | 99 | __u32 kind; |
| 100 | 100 | ||
| 101 | /* Fence-specific type (see nvdev_fence.h) */ | 101 | /* Fence-specific type (see nvdev_fence.h) */ |
| 102 | u32 fence_type; | 102 | __u32 fence_type; |
| 103 | 103 | ||
| 104 | /* Valid for NVDEV_FENCE_TYPE_SYNCPT only */ | 104 | /* Valid for NVDEV_FENCE_TYPE_SYNCPT only */ |
| 105 | u32 syncpt_id; | 105 | __u32 syncpt_id; |
| 106 | u32 syncpt_thresh; | 106 | __u32 syncpt_thresh; |
| 107 | 107 | ||
| 108 | /* The task this fence is associated with */ | 108 | /* The task this fence is associated with */ |
| 109 | u32 task_syncpt_id; | 109 | __u32 task_syncpt_id; |
| 110 | u32 task_syncpt_thresh; | 110 | __u32 task_syncpt_thresh; |
| 111 | 111 | ||
| 112 | /* Valid for NVDEV_FENCE_TYPE_SYNC_FD only */ | 112 | /* Valid for NVDEV_FENCE_TYPE_SYNC_FD only */ |
| 113 | u32 sync_fd; | 113 | __u32 sync_fd; |
| 114 | 114 | ||
| 115 | /* Valid for NVDEV_FENCE_TYPE_SEMAPHORE | 115 | /* Valid for NVDEV_FENCE_TYPE_SEMAPHORE |
| 116 | and NVDEV_FENCE_TYPE_SEMAPHORE_TS */ | 116 | and NVDEV_FENCE_TYPE_SEMAPHORE_TS */ |
| 117 | u32 semaphore_handle; | 117 | __u32 semaphore_handle; |
| 118 | u32 semaphore_offset; | 118 | __u32 semaphore_offset; |
| 119 | u32 semaphore_value; | 119 | __u32 semaphore_value; |
| 120 | } __packed; | 120 | } __packed; |
| 121 | 121 | ||
| 122 | struct nvhost_pva_task_state { | 122 | struct nvhost_pva_task_state { |
| 123 | /* Engine class ID */ | 123 | /* Engine class ID */ |
| 124 | u32 class_id; | 124 | __u32 class_id; |
| 125 | 125 | ||
| 126 | /* Syncpoint ID */ | 126 | /* Syncpoint ID */ |
| 127 | u32 syncpt_id; | 127 | __u32 syncpt_id; |
| 128 | 128 | ||
| 129 | /* Threshold for task completion */ | 129 | /* Threshold for task completion */ |
| 130 | u32 syncpt_thresh; | 130 | __u32 syncpt_thresh; |
| 131 | 131 | ||
| 132 | /* Identifier for the R5/VPU algorithm executed */ | 132 | /* Identifier for the R5/VPU algorithm executed */ |
| 133 | u32 operation; | 133 | __u32 operation; |
| 134 | } __packed; | 134 | } __packed; |
| 135 | 135 | ||
| 136 | enum { | 136 | enum { |
diff --git a/include/uapi/linux/nvhost_isp_ioctl.h b/include/uapi/linux/nvhost_isp_ioctl.h index bbad7b918..d8bc8a2d7 100644 --- a/include/uapi/linux/nvhost_isp_ioctl.h +++ b/include/uapi/linux/nvhost_isp_ioctl.h | |||
| @@ -41,7 +41,7 @@ struct isp_emc { | |||
| 41 | 41 | ||
| 42 | struct isp_la_bw { | 42 | struct isp_la_bw { |
| 43 | /* Total ISP write BW in MBps, either ISO peak BW or non-ISO avg BW */ | 43 | /* Total ISP write BW in MBps, either ISO peak BW or non-ISO avg BW */ |
| 44 | u32 isp_la_bw; | 44 | __u32 isp_la_bw; |
| 45 | /* is ISO or non-ISO */ | 45 | /* is ISO or non-ISO */ |
| 46 | bool is_iso; | 46 | bool is_iso; |
| 47 | }; | 47 | }; |
diff --git a/include/uapi/linux/nvhost_pva_ioctl.h b/include/uapi/linux/nvhost_pva_ioctl.h index fc0940e95..1c8fc7eae 100644 --- a/include/uapi/linux/nvhost_pva_ioctl.h +++ b/include/uapi/linux/nvhost_pva_ioctl.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Tegra PVA Driver ioctls | 2 | * Tegra PVA Driver ioctls |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
| 7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
| @@ -232,10 +232,10 @@ struct pva_ioctl_submit_task { | |||
| 232 | __u64 input_surfaces; | 232 | __u64 input_surfaces; |
| 233 | struct pva_task_parameter input_scalars; | 233 | struct pva_task_parameter input_scalars; |
| 234 | __u64 primary_payload; | 234 | __u64 primary_payload; |
| 235 | u8 reserved0[8]; | 235 | __u8 reserved0[8]; |
| 236 | __u64 output_surfaces; | 236 | __u64 output_surfaces; |
| 237 | struct pva_task_parameter output_scalars; | 237 | struct pva_task_parameter output_scalars; |
| 238 | u8 reserved1[16]; | 238 | __u8 reserved1[16]; |
| 239 | __u64 input_task_status; | 239 | __u64 input_task_status; |
| 240 | __u64 output_task_status; | 240 | __u64 output_task_status; |
| 241 | }; | 241 | }; |
diff --git a/include/uapi/media/imx219.h b/include/uapi/media/imx219.h index 73f4abb7e..71a4bc154 100644 --- a/include/uapi/media/imx219.h +++ b/include/uapi/media/imx219.h | |||
| @@ -35,11 +35,11 @@ | |||
| 35 | #define IMX219_GAIN_ADDR 0x0157 | 35 | #define IMX219_GAIN_ADDR 0x0157 |
| 36 | 36 | ||
| 37 | struct imx219_flash_control { | 37 | struct imx219_flash_control { |
| 38 | u8 enable; | 38 | __u8 enable; |
| 39 | u8 edge_trig_en; | 39 | __u8 edge_trig_en; |
| 40 | u8 start_edge; | 40 | __u8 start_edge; |
| 41 | u8 repeat; | 41 | __u8 repeat; |
| 42 | u16 delay_frm; | 42 | __u16 delay_frm; |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | struct imx219_mode { | 45 | struct imx219_mode { |
diff --git a/include/uapi/media/ov10823.h b/include/uapi/media/ov10823.h index 88a09ca4a..1223ce661 100644 --- a/include/uapi/media/ov10823.h +++ b/include/uapi/media/ov10823.h | |||
| @@ -55,11 +55,11 @@ struct ov10823_grouphold { | |||
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | struct ov10823_flash_control { | 57 | struct ov10823_flash_control { |
| 58 | u8 enable; | 58 | __u8 enable; |
| 59 | u8 edge_trig_en; | 59 | __u8 edge_trig_en; |
| 60 | u8 start_edge; | 60 | __u8 start_edge; |
| 61 | u8 repeat; | 61 | __u8 repeat; |
| 62 | u16 delay_frm; | 62 | __u16 delay_frm; |
| 63 | }; | 63 | }; |
| 64 | 64 | ||
| 65 | #endif /* __UAPI_OV10823_H__ */ \ No newline at end of file | 65 | #endif /* __UAPI_OV10823_H__ */ \ No newline at end of file |
diff --git a/include/uapi/misc/eqos_ape_ioctl.h b/include/uapi/misc/eqos_ape_ioctl.h index 7621c394a..d535fa8f6 100644 --- a/include/uapi/misc/eqos_ape_ioctl.h +++ b/include/uapi/misc/eqos_ape_ioctl.h | |||
| @@ -26,8 +26,8 @@ struct eqos_ape_cmd { | |||
| 26 | }; | 26 | }; |
| 27 | 27 | ||
| 28 | struct eqos_ape_sync_cmd { | 28 | struct eqos_ape_sync_cmd { |
| 29 | u64 drift_num; | 29 | __u64 drift_num; |
| 30 | u64 drift_den; | 30 | __u64 drift_den; |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | struct rate_to_time_period { | 33 | struct rate_to_time_period { |
diff --git a/include/uapi/misc/tegra_mipi_ioctl.h b/include/uapi/misc/tegra_mipi_ioctl.h index 145ebf7fa..b8c4932ad 100644 --- a/include/uapi/misc/tegra_mipi_ioctl.h +++ b/include/uapi/misc/tegra_mipi_ioctl.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
| 5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
| @@ -19,8 +19,8 @@ | |||
| 19 | 19 | ||
| 20 | #define TEGRA_MIPI_IOCTL_MAGIC 'M' | 20 | #define TEGRA_MIPI_IOCTL_MAGIC 'M' |
| 21 | 21 | ||
| 22 | #define TEGRA_MIPI_IOCTL_BIAS_PAD_CTRL _IOW(TEGRA_MIPI_IOCTL_MAGIC, 1, u32) | 22 | #define TEGRA_MIPI_IOCTL_BIAS_PAD_CTRL _IOW(TEGRA_MIPI_IOCTL_MAGIC, 1, __u32) |
| 23 | #define TEGRA_MIPI_IOCTL_CAL _IOW(TEGRA_MIPI_IOCTL_MAGIC, 2, u32) | 23 | #define TEGRA_MIPI_IOCTL_CAL _IOW(TEGRA_MIPI_IOCTL_MAGIC, 2, __u32) |
| 24 | #define TEGRA_MIPI_IOCTL_CAL_STATUS _IOR(TEGRA_MIPI_IOCTL_MAGIC, 3, __u32) | 24 | #define TEGRA_MIPI_IOCTL_CAL_STATUS _IOR(TEGRA_MIPI_IOCTL_MAGIC, 3, __u32) |
| 25 | #define TEGRA_MIPI_IOCTL_BIAS_PAD_CFG0 _IOR(TEGRA_MIPI_IOCTL_MAGIC, 4, __u32) | 25 | #define TEGRA_MIPI_IOCTL_BIAS_PAD_CFG0 _IOR(TEGRA_MIPI_IOCTL_MAGIC, 4, __u32) |
| 26 | #define TEGRA_MIPI_IOCTL_BIAS_PAD_CFG2 _IOR(TEGRA_MIPI_IOCTL_MAGIC, 5, __u32) | 26 | #define TEGRA_MIPI_IOCTL_BIAS_PAD_CFG2 _IOR(TEGRA_MIPI_IOCTL_MAGIC, 5, __u32) |
