staging: vc04_services: Remove typedefs
Subsystems (3)
v2 cover staging: vc04_services: Remove typedefs
This patch removes typedefs from vc04_services files.
Changes in v2:
- Split patches into smaller patches limitied to typedef type. Patch 7:
- Rename "struct vchiq_instance_struct' to "struct vchiq_instance" due to wordiness and agreement between header files.
Jamal Shareef (7):
staging: vc04_services: Remove enum typedefs in vchi
staging: vc04_services: Remove struct typedefs in vchi
staging: vc04_services: Remove function pointer typedef
staging: vc04_services: Remove vchiq_arm enum typedefs
staging: vc04_services: Remove callback typedef
staging: vc04_services: Remove int typedef
staging: vc04_services: Remove struct typedefs vchiq_arm
.../bcm2835-audio/bcm2835-vchiq.c | 6 +- .../vc04_services/bcm2835-audio/bcm2835.h | 2 +- .../vc04_services/bcm2835-camera/mmal-vchiq.c | 6 +- .../vc04_services/interface/vchi/vchi.h | 78 ++++---- .../interface/vchi/vchi_common.h | 26 +-- .../interface/vchiq_arm/vchiq_2835_arm.c | 10 +- .../interface/vchiq_arm/vchiq_arm.c | 170 ++++++++-------- .../interface/vchiq_arm/vchiq_arm.h | 32 ++-- .../interface/vchiq_arm/vchiq_core.c | 116 +++++------ .../interface/vchiq_arm/vchiq_core.h | 90 +++++---- .../interface/vchiq_arm/vchiq_debugfs.c | 14 +- .../interface/vchiq_arm/vchiq_debugfs.h | 4 +- .../interface/vchiq_arm/vchiq_if.h | 92 +++++---- .../interface/vchiq_arm/vchiq_ioctl.h | 4 +- .../interface/vchiq_arm/vchiq_shim.c | 181 +++++++++--------- 15 files changed, 407 insertions(+), 424 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/7 staging: vc04_services: Remove enum typedefs in vchi
Remove enum typedefs from header files and files which include them in vchi. Issue found by checkpatch.
--- .../bcm2835-audio/bcm2835-vchiq.c | 2 +- .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +- .../vc04_services/interface/vchi/vchi.h | 20 ++--- .../interface/vchi/vchi_common.h | 23 ++--- .../interface/vchiq_arm/vchiq_shim.c | 83 +++++++++---------- 5 files changed, 59 insertions(+), 71 deletions(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +1 -1
@@ -90,7 +90,7 @@ static int bcm2835_audio_send_simple(struct bcm2835_audio_instance *instance, }static void audio_vchi_callback (void *param, -const VCHI_CALLBACK_REASON_T reason, +const enum vchi_callback_reason reason,void *msg_handle) {struct bcm2835_audio_instance *instance = param;
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +1 -1
@@ -535,7 +535,7 @@ static void bulk_abort_cb(struct vchiq_mmal_instance *instance,/* incoming event service callback */ static void service_callback (void *param, -const VCHI_CALLBACK_REASON_T reason, +const enum vchi_callback_reason reason,void *bulk_ctx) {struct vchiq_mmal_instance *instance = param;
drivers/staging/vc04_services/interface/vchi/vchi.h +10 -10
@@ -105,8 +105,8 @@ extern int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle);// Routine to set a control option for a named service extern int32_t vchi_service_set_option (const VCHI_SERVICE_HANDLE_T handle, -VCHI_SERVICE_OPTION_T option, -int value); +enum vchi_service_option option, +int value);/* Routine to send a message from kernel memory across a service */ extern int
@@ -126,7 +126,7 @@ extern int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle,void *data, uint32_t max_data_size_to_read, uint32_t *actual_msg_size, - VCHI_FLAGS_T flags); + enum vchi_flags flags);// Routine to look at a message in place. // The message is not dequeued, so a subsequent call to peek or dequeue
@@ -134,7 +134,7 @@ extern int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle,extern int32_t vchi_msg_peek (VCHI_SERVICE_HANDLE_T handle,void **data,uint32_t *msg_size, -VCHI_FLAGS_T flags); +enum vchi_flags flags);// Routine to remove a message after it has been read in place with peek // The first message on the queue is dequeued.
@@ -146,13 +146,13 @@ extern int32_t vchi_msg_remove(VCHI_SERVICE_HANDLE_T handle);extern int32_t vchi_msg_hold (VCHI_SERVICE_HANDLE_T handle,void **data,// } may be NULL, as info can be uint32_t *msg_size,// } obtained from HELD_MSG_T -VCHI_FLAGS_T flags, +enum vchi_flags flags,struct vchi_held_msg *message_descriptor);// Initialise an iterator to look through messages in place extern int32_t vchi_msg_look_ahead (VCHI_SERVICE_HANDLE_T handle,struct vchi_msg_iter *iter, -VCHI_FLAGS_T flags); +enum vchi_flags flags);/******************************************************************************* * Global service support API - operations on held messages
@@ -205,21 +205,21 @@ extern int32_t vchi_msg_iter_hold_next(struct vchi_msg_iter *iter,extern int32_t vchi_bulk_queue_receive (VCHI_SERVICE_HANDLE_T handle,void *data_dst,uint32_t data_size, -VCHI_FLAGS_T flags, +enum vchi_flags flags,void *transfer_handle);// Prepare interface for a transfer from the other side into relocatable memory. int32_t vchi_bulk_queue_receive_reloc (const VCHI_SERVICE_HANDLE_T handle,uint32_t offset,uint32_t data_size, -const VCHI_FLAGS_T flags, +const enum vchi_flags flags,void *const bulk_handle);// Routine to queue up data ready for transfer to the other (once they have signalled they are ready) extern int32_t vchi_bulk_queue_transmit (VCHI_SERVICE_HANDLE_T handle,const void *data_src,uint32_t data_size, -VCHI_FLAGS_T flags, +enum vchi_flags flags,void *transfer_handle);/******************************************************************************
@@ -233,7 +233,7 @@ extern int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle,extern int32_t vchi_bulk_queue_transmit_reloc (VCHI_SERVICE_HANDLE_T handle,uint32_t offset,uint32_t data_size, -VCHI_FLAGS_T flags, +enum vchi_flags flags,void *transfer_handle);#endif /* VCHI_H_ */
drivers/staging/vc04_services/interface/vchi/vchi_common.h +9 -14
@@ -5,7 +5,7 @@#define VCHI_COMMON_H_ //flags used when sending messages (must be bitmapped) -typedef enum { +enum vchi_flags {VCHI_FLAGS_NONE =0x0 ,VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE =0x1 ,// waits for message to be received, or sent (NB. not the same as being seen on other side) VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE =0x2 ,// run a callback when message sent
@@ -20,17 +20,17 @@ typedef enum {VCHI_FLAGS_BULK_DATA_QUEUED =0x040000 ,// internal use only VCHI_FLAGS_BULK_DATA_COMPLETE =0x080000 ,// internal use only VCHI_FLAGS_INTERNAL =0xFF0000 -}VCHI_FLAGS_T ; +};// constants for vchi_crc_control() -typedef enum { +enum vchi_crc_control {VCHI_CRC_NOTHING =-1 ,VCHI_CRC_PER_SERVICE =0 ,VCHI_CRC_EVERYTHING =1 , -}VCHI_CRC_CONTROL_T ; +};//callback reasons when an event occurs on a service -typedef enum { +enum vchi_callback_reason {VCHI_CALLBACK_REASON_MIN , //This indicates that there is data available
@@ -73,21 +73,21 @@ typedef enum {VCHI_CALLBACK_BULK_TRANSMIT_ABORTED , VCHI_CALLBACK_REASON_MAX -}VCHI_CALLBACK_REASON_T ; +};// service control options -typedef enum { +enum vchi_service_option {VCHI_SERVICE_OPTION_MIN ,VCHI_SERVICE_OPTION_TRACE ,VCHI_SERVICE_OPTION_SYNCHRONOUS ,VCHI_SERVICE_OPTION_MAX -}VCHI_SERVICE_OPTION_T ; +};//Callback used by all services / bulk transfers typedef void (*VCHI_CALLBACK_T )(void *callback_param,//my service local param -VCHI_CALLBACK_REASON_T reason, +enum vchi_callback_reason reason,void *handle);//for transmitting msg's only /*
@@ -112,11 +112,6 @@ struct vchi_msg_vector {int32_t vec_len; }; -// Opaque type for a connection API -typedef struct opaque_vchi_connection_api_t VCHI_CONNECTION_API_T ; - -// Opaque type for a message driver -typedef struct opaque_vchi_message_driver_t VCHI_MESSAGE_DRIVER_T ;// Iterator structure for reading ahead through received message queue. Allocated by client, // initialised by vchi_msg_look_ahead. Fields are for internal VCHI use only.
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +38 -45
198 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 2/7 staging: vc04_services: Remove struct typedefs in vchi
In reply to Jamal ShareefRemoves opaque struct typedefs from vchi files. Issue found by checkpatch.
--- .../bcm2835-audio/bcm2835-vchiq.c | 4 +- .../vc04_services/bcm2835-audio/bcm2835.h | 2 +- .../vc04_services/bcm2835-camera/mmal-vchiq.c | 4 +- .../vc04_services/interface/vchi/vchi.h | 54 +++++++------- .../interface/vchi/vchi_common.h | 6 +- .../interface/vchiq_arm/vchiq_shim.c | 72 +++++++++---------- 6 files changed, 71 insertions(+), 71 deletions(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +2 -2
@@ -9,7 +9,7 @@struct bcm2835_audio_instance {struct device *dev; -VCHI_SERVICE_HANDLE_T vchi_handle; +struct vchi_service_handle *vchi_handle;struct completion msg_avail_comp;struct mutex vchi_mutex;struct bcm2835_alsa_stream *alsa_stream;
@@ -122,7 +122,7 @@ static void audio_vchi_callback(void *param, }static int -vc_vchi_audio_init (VCHI_INSTANCE_T vchi_instance, +vc_vchi_audio_init (struct vchi_instance_handle *vchi_instance,struct bcm2835_audio_instance *instance) {struct service_creation params = {
drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +1 -1
@@ -44,7 +44,7 @@ enum snd_bcm2835_ctrl { };struct bcm2835_vchi_ctx { -VCHI_INSTANCE_T vchi_instance; +struct vchi_instance_handle *vchi_instance; };/* definition of the chip-specific record */
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +2 -2
@@ -155,7 +155,7 @@ struct mmal_msg_context { };struct vchiq_mmal_instance { -VCHI_SERVICE_HANDLE_T handle; +struct vchi_service_handle *handle;/* ensure serialised access to service */ struct mutex vchiq_mutex;
@@ -1814,7 +1814,7 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance) {int status;struct vchiq_mmal_instance *instance; -static VCHI_INSTANCE_T vchi_instance; +static struct vchi_instance_handle *vchi_instance;struct service_creation params = { .version =VCHI_VERSION_EX (VC_MMAL_VER ,VC_MMAL_MIN_VER ), .service_id =VC_MMAL_SERVER_NAME ,
drivers/staging/vc04_services/interface/vchi/vchi.h +27 -27
155 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchi/vchi_common.h +3 -3
@@ -86,9 +86,9 @@ enum vchi_service_option { };//Callback used by all services / bulk transfers -typedef void (*VCHI_CALLBACK_T )(void *callback_param,//my service local param -enum vchi_callback_reason reason, -void *handle);//for transmitting msg's only +typedef void (*VCHI_CALLBACK_T )(void *callback_param,//my service local param +enum vchi_callback_reason reason, +void *handle);//for transmitting msg's only /* * Define vector struct for scatter-gather (vector) operations
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +36 -36
276 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 3/7 staging: vc04_services: Remove function pointer typedef
In reply to Jamal ShareefRemoves function pointer typedef in vchi files. Issue found by checkpatch.
--- drivers/staging/vc04_services/interface/vchi/vchi.h | 4 +++- drivers/staging/vc04_services/interface/vchi/vchi_common.h | 5 ----- .../staging/vc04_services/interface/vchiq_arm/vchiq_shim.c | 4 +++- 3 files changed, 6 insertions(+), 7 deletions(-)
drivers/staging/vc04_services/interface/vchi/vchi.h +3 -1
@@ -45,7 +45,9 @@ struct vchi_held_msg {struct service_creation {struct vchi_version version;int32_t service_id; -VCHI_CALLBACK_T callback; +void (*callback)(void *callback_param,//my service local param +enum vchi_callback_reason reason, +void *handle);//for transmitting msg's only void *callback_param; };
drivers/staging/vc04_services/interface/vchi/vchi_common.h +0 -5
@@ -85,11 +85,6 @@ enum vchi_service_option { VCHI_SERVICE_OPTION_MAX }; -//Callback used by all services / bulk transfers -typedef void (*VCHI_CALLBACK_T )(void *callback_param,//my service local param -enum vchi_callback_reason reason, -void *handle);//for transmitting msg's only -/* * Define vector struct for scatter-gather (vector) operations * Vectors can be nested - if a vector element has negative length, then
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +3 -1
@@ -16,7 +16,9 @@ struct shim_service {struct vchiu_queue queue; -VCHI_CALLBACK_T callback; +void (*callback)(void *callback_param,//my service local param +enum vchi_callback_reason reason, +void *handle);//for transmitting msg's only void *callback_param; };
Signature · 1 line
2.17.1
PATCH v2 4/7 staging: vc04_services: Remove vchiq_arm enum typedefs
In reply to Jamal ShareefRemoves enum typedefs from vchiq_arm files. Issue found by checkpatch.
--- .../interface/vchiq_arm/vchiq_2835_arm.c | 10 +- .../interface/vchiq_arm/vchiq_arm.c | 118 +++++++++--------- .../interface/vchiq_arm/vchiq_arm.h | 18 +-- .../interface/vchiq_arm/vchiq_core.c | 82 ++++++------ .../interface/vchiq_arm/vchiq_core.h | 52 ++++---- .../interface/vchiq_arm/vchiq_if.h | 69 +++++----- .../interface/vchiq_arm/vchiq_ioctl.h | 4 +- .../interface/vchiq_arm/vchiq_shim.c | 28 ++--- 8 files changed, 191 insertions(+), 190 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +5 -5
@@ -168,10 +168,10 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)return 0 ; } -VCHIQ_STATUS_T +enum vchiq_status vchiq_platform_init_state (struct vchiq_state *state) { -VCHIQ_STATUS_T status =VCHIQ_SUCCESS ; +enum vchiq_status status =VCHIQ_SUCCESS ;struct vchiq_2835_state *platform_state; state->platform_state =kzalloc (sizeof (*platform_state),GFP_KERNEL );
@@ -214,7 +214,7 @@ remote_event_signal(struct remote_event *event)writel (0 , g_regs +BELL2 );/* trigger vc interrupt */ } -VCHIQ_STATUS_T +enum vchiq_status vchiq_prepare_bulk_data (struct vchiq_bulk *bulk,void *offset,int size,int dir) {
@@ -258,13 +258,13 @@ vchiq_dump_platform_state(void *dump_context)vchiq_dump (dump_context, buf, len +1 ); } -VCHIQ_STATUS_T +enum vchiq_status vchiq_platform_suspend (struct vchiq_state *state) {return VCHIQ_ERROR ; } -VCHIQ_STATUS_T +enum vchiq_status vchiq_platform_resume (struct vchiq_state *state) {return VCHIQ_SUCCESS ;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +59 -59
372 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +9 -9
@@ -109,13 +109,13 @@ int vchiq_platform_init(struct platform_device *pdev,extern struct vchiq_state *vchiq_get_state (void ); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_arm_vcsuspend (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_arm_vcresume (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_arm_init_state (struct vchiq_state *state,struct vchiq_arm_state *arm_state);
@@ -124,16 +124,16 @@ vchiq_check_resume(struct vchiq_state *state);extern void vchiq_check_suspend (struct vchiq_state *state); -VCHIQ_STATUS_T +enum vchiq_status vchiq_use_service (VCHIQ_SERVICE_HANDLE_T handle); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_release_service (VCHIQ_SERVICE_HANDLE_T handle); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_check_service (struct vchiq_service *service); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_platform_suspend (struct vchiq_state *state); extern int
@@ -154,10 +154,10 @@ vchiq_platform_get_arm_state(struct vchiq_state *state);extern int vchiq_videocore_wanted (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_use_internal (struct vchiq_state *state,struct vchiq_service *service,enum USE_TYPE_E use_type); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_release_internal (struct vchiq_state *state,struct vchiq_service *service);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +41 -41
270 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +26 -26
160 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +35 -34
123 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +2 -2
@@ -28,7 +28,7 @@ struct vchiq_queue_bulk_transfer {void *data;unsigned int size;void *userdata; -VCHIQ_BULK_MODE_T mode; +enum vchiq_bulk_mode mode; };struct vchiq_completion_data {
@@ -60,7 +60,7 @@ struct vchiq_get_config {struct vchiq_set_service_option {unsigned int handle; -VCHIQ_SERVICE_OPTION_T option; +enum vchiq_service_option option;int value; };
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +14 -14
@@ -107,7 +107,7 @@ int32_t vchi_msg_queue(struct vchi_service_handle *handle, void *context, uint32_t data_size) {struct shim_service *service = (struct shim_service *)handle; -VCHIQ_STATUS_T status; +enum vchiq_status status;while (1 ) { status = vchiq_queue_message(service->handle,
@@ -203,8 +203,8 @@ int32_t vchi_bulk_queue_receive(struct vchi_service_handle *handle, void *data_d void *bulk_handle) {struct shim_service *service = (struct shim_service *)handle; -VCHIQ_BULK_MODE_T mode; -VCHIQ_STATUS_T status; +enum vchiq_bulk_mode mode; +enum vchiq_status status;switch ((int )flags) { case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
@@ -263,8 +263,8 @@ int32_t vchi_bulk_queue_transmit(struct vchi_service_handle *handle, void *bulk_handle) {struct shim_service *service = (struct shim_service *)handle; -VCHIQ_BULK_MODE_T mode; -VCHIQ_STATUS_T status; +enum vchiq_bulk_mode mode; +enum vchiq_status status;switch ((int )flags) { case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
@@ -366,7 +366,7 @@ int32_t vchi_held_msg_release(struct vchi_held_msg *message)* to a pointer. */ -vchiq_release_message ((VCHIQ_SERVICE_HANDLE_T )(long )message->service, +vchiq_release_message ((unsigned int )(long )message->service, (struct vchiq_header *)message->message);return 0 ;
@@ -441,7 +441,7 @@ EXPORT_SYMBOL(vchi_msg_hold);int32_t vchi_initialise (struct vchi_instance_handle **instance_handle) {VCHIQ_INSTANCE_T instance; -VCHIQ_STATUS_T status; +enum vchiq_status status; status =vchiq_initialise (&instance);
@@ -503,7 +503,7 @@ EXPORT_SYMBOL(vchi_disconnect);* ***********************************************************/ -static VCHIQ_STATUS_T shim_callback (enum vchiq_reason reason, +static enum vchiq_status shim_callback (enum vchiq_reason reason,struct vchiq_header *header,VCHIQ_SERVICE_HANDLE_T handle,void *bulk_user)
@@ -604,7 +604,7 @@ int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,if (service) {struct vchiq_service_params params; -VCHIQ_STATUS_T status; +enum vchiq_status status;memset (¶ms,0 ,sizeof (params)); params.fourcc = setup->service_id;
@@ -632,7 +632,7 @@ int32_t vchi_service_close(const struct vchi_service_handle *handle)struct shim_service *service = (struct shim_service *)handle;if (service) { -VCHIQ_STATUS_T status =vchiq_close_service (service->handle); +enum vchiq_status status =vchiq_close_service (service->handle);if (status ==VCHIQ_SUCCESS )service_free (service);
@@ -648,7 +648,7 @@ int32_t vchi_service_destroy(const struct vchi_service_handle *handle)struct shim_service *service = (struct shim_service *)handle;if (service) { -VCHIQ_STATUS_T status =vchiq_remove_service (service->handle); +enum vchiq_status status =vchiq_remove_service (service->handle);if (status ==VCHIQ_SUCCESS ) {service_free (service);
@@ -667,7 +667,7 @@ int32_t vchi_service_set_option(const struct vchi_service_handle *handle, {int32_t ret =-1 ;struct shim_service *service = (struct shim_service *)handle; -VCHIQ_SERVICE_OPTION_T vchiq_option; +enum vchiq_service_option vchiq_option;switch (option) {case VCHI_SERVICE_OPTION_TRACE :
@@ -681,7 +681,7 @@ int32_t vchi_service_set_option(const struct vchi_service_handle *handle,break ; }if (service) { -VCHIQ_STATUS_T status = +enum vchiq_status status =vchiq_set_service_option (service->handle, vchiq_option, value);
@@ -699,7 +699,7 @@ int32_t vchi_get_peer_version(const struct vchi_service_handle *handle,struct shim_service *service = (struct shim_service *)handle;if (service) { -VCHIQ_STATUS_T status; +enum vchiq_status status; status =vchiq_get_peer_version (service->handle, peer_version); ret =vchiq_status_to_vchi (status);
Signature · 1 line
2.17.1
PATCH v2 5/7 staging: vc04_services: Remove callback typedef
In reply to Jamal ShareefRemoves callback typedefs. Issue found by checkpatch.
--- .../vc04_services/interface/vchiq_arm/vchiq_if.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +7 -9
@@ -63,20 +63,19 @@ struct vchiq_element {typedef unsigned int VCHIQ_SERVICE_HANDLE_T ; -typedef enum vchiq_status (*VCHIQ_CALLBACK_T )(enum vchiq_reason , -struct vchiq_header *, -VCHIQ_SERVICE_HANDLE_T ,void *); - -struct vchiq_service_base {int fourcc; -VCHIQ_CALLBACK_T callback; +enum vchiq_status (*callback)(enum vchiq_reason , +struct vchiq_header *, +unsigned int ,void *);void *userdata; };struct vchiq_service_params {int fourcc; -VCHIQ_CALLBACK_T callback; +enum vchiq_status (*callback)(enum vchiq_reason , +struct vchiq_header *, +unsigned int ,void *);void *userdata;short version;/* Increment for non-trivial changes */ short version_min;/* Update for incompatible changes */
@@ -94,7 +93,6 @@ struct vchiq_config { };typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T ; -typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T )(void *cb_arg);extern enum vchiq_status vchiq_initialise (VCHIQ_INSTANCE_T *pinstance);extern enum vchiq_status vchiq_shutdown (VCHIQ_INSTANCE_T instance);
@@ -137,7 +135,7 @@ extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service enum vchiq_service_option option, int value);extern enum vchiq_status vchiq_remote_use (VCHIQ_INSTANCE_T instance, -VCHIQ_REMOTE_USE_CALLBACK_T callback,void *cb_arg); +void (*callback)(void *cb_arg),void *cb_arg);extern enum vchiq_status vchiq_remote_release (VCHIQ_INSTANCE_T instance); extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
Signature · 1 line
2.17.1
PATCH v2 6/7 staging: vc04_services: Remove int typedef
In reply to Jamal ShareefRemoves unsigned int typedef. Issue found by checkpatch.
--- .../interface/vchiq_arm/vchiq_arm.c | 40 +++++++++---------- .../interface/vchiq_arm/vchiq_arm.h | 4 +- .../interface/vchiq_arm/vchiq_core.c | 28 ++++++------- .../interface/vchiq_arm/vchiq_core.h | 12 +++--- .../interface/vchiq_arm/vchiq_if.h | 38 +++++++++--------- .../interface/vchiq_arm/vchiq_shim.c | 8 ++-- 6 files changed, 64 insertions(+), 66 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +20 -20
@@ -173,7 +173,7 @@ vchiq_static_assert(ARRAY_SIZE(ioctl_names) == (VCHIQ_IOC_MAX + 1));static enum vchiq_status -vchiq_blocking_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *data, +vchiq_blocking_bulk_transfer (unsigned int handle,void *data,unsigned int size,enum vchiq_bulk_dir dir);#define VCHIQ_INIT_RETRIES 10
@@ -304,7 +304,7 @@ EXPORT_SYMBOL(vchiq_connect);enum vchiq_status vchiq_add_service (VCHIQ_INSTANCE_T instance,const struct vchiq_service_params *params, -VCHIQ_SERVICE_HANDLE_T *phandle) +unsigned int *phandle) {enum vchiq_status status;struct vchiq_state *state = instance->state;
@@ -343,7 +343,7 @@ EXPORT_SYMBOL(vchiq_add_service);enum vchiq_status vchiq_open_service (VCHIQ_INSTANCE_T instance,const struct vchiq_service_params *params, -VCHIQ_SERVICE_HANDLE_T *phandle) +unsigned int *phandle) {enum vchiq_status status =VCHIQ_ERROR ;struct vchiq_state *state = instance->state;
@@ -381,7 +381,7 @@ enum vchiq_status vchiq_open_service(EXPORT_SYMBOL (vchiq_open_service);enum vchiq_status -vchiq_bulk_transmit (VCHIQ_SERVICE_HANDLE_T handle,const void *data, +vchiq_bulk_transmit (unsigned int handle,const void *data,unsigned int size,void *userdata,enum vchiq_bulk_mode mode) {enum vchiq_status status;
@@ -406,7 +406,7 @@ vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data,EXPORT_SYMBOL (vchiq_bulk_transmit);enum vchiq_status -vchiq_bulk_receive (VCHIQ_SERVICE_HANDLE_T handle,void *data, +vchiq_bulk_receive (unsigned int handle,void *data,unsigned int size,void *userdata,enum vchiq_bulk_mode mode) {enum vchiq_status status;
@@ -430,7 +430,7 @@ vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data,EXPORT_SYMBOL (vchiq_bulk_receive);static enum vchiq_status -vchiq_blocking_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *data, +vchiq_blocking_bulk_transfer (unsigned int handle,void *data,unsigned int size,enum vchiq_bulk_dir dir) {VCHIQ_INSTANCE_T instance;
@@ -584,7 +584,7 @@ add_completion(VCHIQ_INSTANCE_T instance, enum vchiq_reason reason,static enum vchiq_status service_callback (enum vchiq_reason reason,struct vchiq_header *header, -VCHIQ_SERVICE_HANDLE_T handle,void *bulk_userdata) +unsigned int handle,void *bulk_userdata) {/* How do we ensure the callback goes to the right client? ** The service_user data points to a user_service record
@@ -773,7 +773,7 @@ static ssize_t vchiq_ioc_copy_element_data(void *context, void *dest,* **************************************************************************/ static enum vchiq_status -vchiq_ioc_queue_message (VCHIQ_SERVICE_HANDLE_T handle, +vchiq_ioc_queue_message (unsigned int handle,struct vchiq_element *elements,unsigned long count) {
@@ -952,7 +952,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case VCHIQ_IOC_CLOSE_SERVICE :case VCHIQ_IOC_REMOVE_SERVICE : { -VCHIQ_SERVICE_HANDLE_T handle = (unsigned int )arg; +unsigned int handle = (unsigned int )arg;struct user_service *user_service; service =find_service_for_instance (instance, handle);
@@ -985,7 +985,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case VCHIQ_IOC_USE_SERVICE :case VCHIQ_IOC_RELEASE_SERVICE : { -VCHIQ_SERVICE_HANDLE_T handle = (unsigned int )arg; +unsigned int handle = (unsigned int )arg; service =find_service_for_instance (instance, handle);if (service) {
@@ -1368,7 +1368,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) }break ;case VCHIQ_IOC_GET_CLIENT_ID : { -VCHIQ_SERVICE_HANDLE_T handle = (unsigned int )arg; +unsigned int handle = (unsigned int )arg; ret =vchiq_get_client_id (handle); }break ;
@@ -1423,7 +1423,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) }break ;case VCHIQ_IOC_CLOSE_DELIVERED : { -VCHIQ_SERVICE_HANDLE_T handle = (unsigned int )arg; +unsigned int handle = (unsigned int )arg; service =find_closed_service_for_instance (instance, handle);if (service) {
@@ -1484,7 +1484,7 @@ struct vchiq_create_service32 {struct vchiq_service_params32 params;int is_open;int is_vchi; -VCHIQ_SERVICE_HANDLE_T handle;/* OUT */ +unsigned int handle;/* OUT */ };#define VCHIQ_IOC_CREATE_SERVICE32 \
@@ -1544,7 +1544,7 @@ struct vchiq_element32 { };struct vchiq_queue_message32 { -VCHIQ_SERVICE_HANDLE_T handle; +unsigned int handle;unsigned int count;compat_uptr_t elements; };
@@ -1607,7 +1607,7 @@ vchiq_compat_ioctl_queue_message(struct file *file, }struct vchiq_queue_bulk_transfer32 { -VCHIQ_SERVICE_HANDLE_T handle; +unsigned int handle;compat_uptr_t data;unsigned int size;compat_uptr_t userdata;
@@ -1824,7 +1824,7 @@ vchiq_compat_ioctl_await_completion(struct file *file, }struct vchiq_dequeue_message32 { -VCHIQ_SERVICE_HANDLE_T handle; +unsigned int handle;int blocking;unsigned int bufsize;compat_uptr_t buf;
@@ -2273,7 +2273,7 @@ vchiq_videocore_wanted(struct vchiq_state *state)static enum vchiq_status vchiq_keepalive_vchiq_callback (enum vchiq_reason reason,struct vchiq_header *header, -VCHIQ_SERVICE_HANDLE_T service_user, +unsigned int service_user,void *bulk_user) { vchiq_log_error(vchiq_susp_log_level,
@@ -2289,7 +2289,7 @@ vchiq_keepalive_thread_func(void *v)enum vchiq_status status;VCHIQ_INSTANCE_T instance; -VCHIQ_SERVICE_HANDLE_T ka_handle; +unsigned int ka_handle;struct vchiq_service_params params = { .fourcc =VCHIQ_MAKE_FOURCC ('K' ,'E' ,'E' ,'P' ),
@@ -2970,7 +2970,7 @@ static void suspend_timer_callback(struct timer_list *t) }enum vchiq_status -vchiq_use_service (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_use_service (unsigned int handle) {enum vchiq_status ret =VCHIQ_ERROR ;struct vchiq_service *service =find_service_by_handle (handle);
@@ -2984,7 +2984,7 @@ vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle) }enum vchiq_status -vchiq_release_service (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_release_service (unsigned int handle) {enum vchiq_status ret =VCHIQ_ERROR ;struct vchiq_service *service =find_service_by_handle (handle);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +2 -2
@@ -125,10 +125,10 @@ vchiq_check_resume(struct vchiq_state *state);extern void vchiq_check_suspend (struct vchiq_state *state);enum vchiq_status -vchiq_use_service (VCHIQ_SERVICE_HANDLE_T handle); +vchiq_use_service (unsigned int handle);extern enum vchiq_status -vchiq_release_service (VCHIQ_SERVICE_HANDLE_T handle); +vchiq_release_service (unsigned int handle);extern enum vchiq_status vchiq_check_service (struct vchiq_service *service);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +14 -14
@@ -59,7 +59,7 @@ DEFINE_SPINLOCK(bulk_waiter_spinlock);static DEFINE_SPINLOCK (quota_spinlock);struct vchiq_state *vchiq_states[VCHIQ_MAX_STATES ]; -static VCHIQ_SERVICE_HANDLE_T handle_seq; +static unsigned int handle_seq;static const char *const srvstate_names[] = {"FREE" ,
@@ -132,7 +132,7 @@ vchiq_set_service_state(struct vchiq_service *service, int newstate) }struct vchiq_service * -find_service_by_handle (VCHIQ_SERVICE_HANDLE_T handle) +find_service_by_handle (unsigned int handle) {struct vchiq_service *service;
@@ -178,7 +178,7 @@ find_service_by_port(struct vchiq_state *state, int localport)struct vchiq_service *find_service_for_instance (VCHIQ_INSTANCE_T instance, -VCHIQ_SERVICE_HANDLE_T handle) +unsigned int handle) {struct vchiq_service *service;
@@ -202,7 +202,7 @@ find_service_for_instance(VCHIQ_INSTANCE_T instance,struct vchiq_service *find_closed_service_for_instance (VCHIQ_INSTANCE_T instance, -VCHIQ_SERVICE_HANDLE_T handle) +unsigned int handle) {struct vchiq_service *service;
@@ -295,7 +295,7 @@ unlock_service(struct vchiq_service *service) }int -vchiq_get_client_id (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_get_client_id (unsigned int handle) {struct vchiq_service *service =find_service_by_handle (handle);int id;
@@ -308,7 +308,7 @@ vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T handle) }void * -vchiq_get_service_userdata (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_get_service_userdata (unsigned int handle) {struct vchiq_service *service =handle_to_service (handle);
@@ -316,7 +316,7 @@ vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T handle) }int -vchiq_get_service_fourcc (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_get_service_fourcc (unsigned int handle) {struct vchiq_service *service =handle_to_service (handle);
@@ -2828,7 +2828,7 @@ vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance) }enum vchiq_status -vchiq_close_service (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_close_service (unsigned int handle) {/* Unregister the service */ struct vchiq_service *service =find_service_by_handle (handle);
@@ -2887,7 +2887,7 @@ vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle) }enum vchiq_status -vchiq_remove_service (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_remove_service (unsigned int handle) {/* Unregister the service */ struct vchiq_service *service =find_service_by_handle (handle);
@@ -2952,7 +2952,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)* When called in blocking mode, the userdata field points to a bulk_waiter * structure. */ -enum vchiq_status vchiq_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle, +enum vchiq_status vchiq_bulk_transfer (unsigned int handle,void *offset,int size,void *userdata,enum vchiq_bulk_mode mode,enum vchiq_bulk_dir dir)
@@ -3101,7 +3101,7 @@ enum vchiq_status vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, } enum vchiq_status -vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle, +vchiq_queue_message(unsigned int handle, ssize_t (*copy_callback)(void *context, void *dest, size_t offset, size_t maxsize), void *context,
@@ -3153,7 +3153,7 @@ vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle, }void -vchiq_release_message (VCHIQ_SERVICE_HANDLE_T handle, +vchiq_release_message (unsigned int handle,struct vchiq_header *header) {struct vchiq_service *service =find_service_by_handle (handle);
@@ -3193,7 +3193,7 @@ release_message_sync(struct vchiq_state *state, struct vchiq_header *header) }enum vchiq_status -vchiq_get_peer_version (VCHIQ_SERVICE_HANDLE_T handle,short *peer_version) +vchiq_get_peer_version (unsigned int handle,short *peer_version) {enum vchiq_status status =VCHIQ_ERROR ;struct vchiq_service *service =find_service_by_handle (handle);
@@ -3222,7 +3222,7 @@ void vchiq_get_config(struct vchiq_config *config) }enum vchiq_status -vchiq_set_service_option (VCHIQ_SERVICE_HANDLE_T handle, +vchiq_set_service_option (unsigned int handle,enum vchiq_service_option option,int value) {struct vchiq_service *service =find_service_by_handle (handle);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +6 -6
@@ -250,7 +250,7 @@ struct vchiq_slot_info {struct vchiq_service {struct vchiq_service_base base; -VCHIQ_SERVICE_HANDLE_T handle; +unsigned int handle;unsigned int ref_count;int srvstate;VCHIQ_USERDATA_TERM_T userdata_term;
@@ -522,7 +522,7 @@ extern void remote_event_pollall(struct vchiq_state *state);extern enum vchiq_status -vchiq_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *offset,int size, +vchiq_bulk_transfer (unsigned int handle,void *offset,int size,void *userdata,enum vchiq_bulk_mode mode,enum vchiq_bulk_dir dir);
@@ -543,7 +543,7 @@ request_poll(struct vchiq_state *state, struct vchiq_service *service, int poll_type);static inline struct vchiq_service * -handle_to_service (VCHIQ_SERVICE_HANDLE_T handle) +handle_to_service (unsigned int handle) {struct vchiq_state *state = vchiq_states[(handle /VCHIQ_MAX_SERVICES ) & (VCHIQ_MAX_STATES -1 )];
@@ -554,18 +554,18 @@ handle_to_service(VCHIQ_SERVICE_HANDLE_T handle) }extern struct vchiq_service * -find_service_by_handle (VCHIQ_SERVICE_HANDLE_T handle); +find_service_by_handle (unsigned int handle);extern struct vchiq_service *find_service_by_port (struct vchiq_state *state,int localport);extern struct vchiq_service *find_service_for_instance (VCHIQ_INSTANCE_T instance, -VCHIQ_SERVICE_HANDLE_T handle); +unsigned int handle);extern struct vchiq_service *find_closed_service_for_instance (VCHIQ_INSTANCE_T instance, -VCHIQ_SERVICE_HANDLE_T handle); +unsigned int handle);extern struct vchiq_service * next_service_by_instance(struct vchiq_state *state, VCHIQ_INSTANCE_T instance,
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +18 -20
@@ -61,8 +61,6 @@ struct vchiq_element {unsigned int size; }; -typedef unsigned int VCHIQ_SERVICE_HANDLE_T ; -struct vchiq_service_base {int fourcc; enum vchiq_status (*callback)(enum vchiq_reason,
@@ -99,49 +97,49 @@ extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);extern enum vchiq_status vchiq_connect (VCHIQ_INSTANCE_T instance);extern enum vchiq_status vchiq_add_service (VCHIQ_INSTANCE_T instance,const struct vchiq_service_params *params, -VCHIQ_SERVICE_HANDLE_T *pservice); +unsigned int *pservice);extern enum vchiq_status vchiq_open_service (VCHIQ_INSTANCE_T instance,const struct vchiq_service_params *params, -VCHIQ_SERVICE_HANDLE_T *pservice); -extern enum vchiq_status vchiq_close_service (VCHIQ_SERVICE_HANDLE_T service); -extern enum vchiq_status vchiq_remove_service (VCHIQ_SERVICE_HANDLE_T service); -extern enum vchiq_status vchiq_use_service (VCHIQ_SERVICE_HANDLE_T service); -extern enum vchiq_status vchiq_release_service (VCHIQ_SERVICE_HANDLE_T service); +unsigned int *pservice); +extern enum vchiq_status vchiq_close_service (unsigned int service); +extern enum vchiq_status vchiq_remove_service (unsigned int service); +extern enum vchiq_status vchiq_use_service (unsigned int service); +extern enum vchiq_status vchiq_release_service (unsigned int service);extern enum vchiq_status -vchiq_queue_message (VCHIQ_SERVICE_HANDLE_T handle, +vchiq_queue_message (unsigned int handle,ssize_t (*copy_callback)(void *context,void *dest,size_t offset,size_t maxsize),void *context,size_t size); -extern void vchiq_release_message (VCHIQ_SERVICE_HANDLE_T service, +extern void vchiq_release_message (unsigned int service,struct vchiq_header *header); -extern enum vchiq_status vchiq_bulk_transmit (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_bulk_transmit (unsigned int service,const void *data,unsigned int size,void *userdata,enum vchiq_bulk_mode mode); -extern enum vchiq_status vchiq_bulk_receive (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_bulk_receive (unsigned int service,void *data,unsigned int size,void *userdata,enum vchiq_bulk_mode mode); -extern enum vchiq_status vchiq_bulk_transmit_handle (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_bulk_transmit_handle (unsigned int service,const void *offset,unsigned int size,void *userdata,enum vchiq_bulk_mode mode); -extern enum vchiq_status vchiq_bulk_receive_handle (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_bulk_receive_handle (unsigned int service,void *offset,unsigned int size,void *userdata,enum vchiq_bulk_mode mode); -extern int vchiq_get_client_id (VCHIQ_SERVICE_HANDLE_T service); -extern void *vchiq_get_service_userdata (VCHIQ_SERVICE_HANDLE_T service); -extern int vchiq_get_service_fourcc (VCHIQ_SERVICE_HANDLE_T service); +extern int vchiq_get_client_id (unsigned int service); +extern void *vchiq_get_service_userdata (unsigned int service); +extern int vchiq_get_service_fourcc (unsigned int service);extern void vchiq_get_config (struct vchiq_config *config); -extern enum vchiq_status vchiq_set_service_option (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_set_service_option (unsigned int service,enum vchiq_service_option option,int value);extern enum vchiq_status vchiq_remote_use (VCHIQ_INSTANCE_T instance,void (*callback)(void *cb_arg),void *cb_arg);extern enum vchiq_status vchiq_remote_release (VCHIQ_INSTANCE_T instance); -extern enum vchiq_status vchiq_dump_phys_mem (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_dump_phys_mem (unsigned int service,void *ptr,size_t num_bytes); -extern enum vchiq_status vchiq_get_peer_version (VCHIQ_SERVICE_HANDLE_T handle, +extern enum vchiq_status vchiq_get_peer_version (unsigned int handle,short *peer_version);#endif /* VCHIQ_IF_H */
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +4 -4
@@ -12,7 +12,7 @@#define vchiq_status_to_vchi (status) ((int32_t)status)struct shim_service { -VCHIQ_SERVICE_HANDLE_T handle; +unsigned int handle;struct vchiu_queue queue;
@@ -360,7 +360,7 @@ int32_t vchi_held_msg_release(struct vchi_held_msg *message) {/* * Convert the service field pointer back to an -* VCHIQ_SERVICE_HANDLE_T which is an int. +* unsigned int which is an int. * This pointer is opaque to everything except * vchi_msg_hold which simply upcasted the int * to a pointer.
@@ -410,7 +410,7 @@ int32_t vchi_msg_hold(struct vchi_service_handle *handle, void **data, *msg_size = header->size;/* -* upcast the VCHIQ_SERVICE_HANDLE_T which is an int +* upcast the unsigned int which is an int * to a pointer and stuff it in the held message. * This pointer is opaque to everything except * vchi_held_msg_release which simply downcasts it back
@@ -505,7 +505,7 @@ EXPORT_SYMBOL(vchi_disconnect);static enum vchiq_status shim_callback (enum vchiq_reason reason,struct vchiq_header *header, -VCHIQ_SERVICE_HANDLE_T handle, +unsigned int handle,void *bulk_user) { struct shim_service *service =
Signature · 1 line
2.17.1
PATCH v2 7/7 staging: vc04_services: Remove struct typedefs vchiq_arm
In reply to Jamal ShareefRemoves struct typedefs in vchiq_arm files. Issue found by checkpatch.
Renames "struct vchiq_instance_struct" to "struct vchiq_instance" because of redundancy and for clarity between header files vchiq_arm.c (line ~103) and vchiq_if.h (line ~90).
--- .../interface/vchiq_arm/vchiq_arm.c | 46 +++++++++---------- .../interface/vchiq_arm/vchiq_arm.h | 10 ++-- .../interface/vchiq_arm/vchiq_core.c | 12 ++--- .../interface/vchiq_arm/vchiq_core.h | 26 +++++------ .../interface/vchiq_arm/vchiq_debugfs.c | 14 +++--- .../interface/vchiq_arm/vchiq_debugfs.h | 4 +- .../interface/vchiq_arm/vchiq_if.h | 25 +++++----- .../interface/vchiq_arm/vchiq_shim.c | 10 ++-- 8 files changed, 73 insertions(+), 74 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +23 -23
@@ -84,7 +84,7 @@ static void suspend_timer_callback(struct timer_list *t);struct user_service {struct vchiq_service *service;void *userdata; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;char is_vchi;char dequeue_pending;char close_pending;
@@ -103,7 +103,7 @@ struct bulk_waiter_node {struct list_head list; }; -struct vchiq_instance_struct { +struct vchiq_instance {struct vchiq_state *state;struct vchiq_completion_data completions[MAX_COMPLETIONS ];int completion_insert;
@@ -177,11 +177,11 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data, unsigned int size, enum vchiq_bulk_dir dir);#define VCHIQ_INIT_RETRIES 10 -enum vchiq_status vchiq_initialise (VCHIQ_INSTANCE_T *instance_out) +enum vchiq_status vchiq_initialise (struct vchiq_instance **instance_out) {enum vchiq_status status =VCHIQ_ERROR ;struct vchiq_state *state; -VCHIQ_INSTANCE_T instance =NULL ; +struct vchiq_instance *instance =NULL ;int i;vchiq_log_trace (vchiq_core_log_level,"%s called" , __func__);
@@ -230,7 +230,7 @@ enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *instance_out) }EXPORT_SYMBOL (vchiq_initialise); -enum vchiq_status vchiq_shutdown (VCHIQ_INSTANCE_T instance) +enum vchiq_status vchiq_shutdown (struct vchiq_instance *instance) {enum vchiq_status status;struct vchiq_state *state = instance->state;
@@ -267,12 +267,12 @@ enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance) }EXPORT_SYMBOL (vchiq_shutdown); -static int vchiq_is_connected (VCHIQ_INSTANCE_T instance) +static int vchiq_is_connected (struct vchiq_instance *instance) {return instance->connected; } -enum vchiq_status vchiq_connect (VCHIQ_INSTANCE_T instance) +enum vchiq_status vchiq_connect (struct vchiq_instance *instance) {enum vchiq_status status;struct vchiq_state *state = instance->state;
@@ -302,7 +302,7 @@ enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance)EXPORT_SYMBOL (vchiq_connect);enum vchiq_status vchiq_add_service ( -VCHIQ_INSTANCE_T instance, +struct vchiq_instance *instance,const struct vchiq_service_params *params,unsigned int *phandle) {
@@ -341,7 +341,7 @@ enum vchiq_status vchiq_add_service(EXPORT_SYMBOL (vchiq_add_service);enum vchiq_status vchiq_open_service ( -VCHIQ_INSTANCE_T instance, +struct vchiq_instance *instance,const struct vchiq_service_params *params,unsigned int *phandle) {
@@ -433,7 +433,7 @@ static enum vchiq_status vchiq_blocking_bulk_transfer(unsigned int handle, void *data, unsigned int size, enum vchiq_bulk_dir dir) { - VCHIQ_INSTANCE_T instance; + struct vchiq_instance *instance;struct vchiq_service *service;enum vchiq_status status;struct bulk_waiter_node *waiter =NULL ;
@@ -516,7 +516,7 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,***************************************************************************/ static enum vchiq_status -add_completion (VCHIQ_INSTANCE_T instance,enum vchiq_reason reason, +add_completion (struct vchiq_instance *instance,enum vchiq_reason reason,struct vchiq_header *header,struct user_service *user_service,void *bulk_userdata) {
@@ -593,7 +593,7 @@ service_callback(enum vchiq_reason reason, struct vchiq_header *header,*/ struct user_service *user_service;struct vchiq_service *service; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;bool skip_completion = false;DEBUG_INITIALISE (g_state.local)
@@ -804,7 +804,7 @@ vchiq_ioc_queue_message(unsigned int handle,static long vchiq_ioctl (struct file *file,unsigned int cmd,unsigned long arg) { -VCHIQ_INSTANCE_T instance = file->private_data; +struct vchiq_instance *instance = file->private_data;enum vchiq_status status =VCHIQ_SUCCESS ;struct vchiq_service *service =NULL ;long ret =0 ;
@@ -1919,7 +1919,7 @@ vchiq_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)static int vchiq_open (struct inode *inode,struct file *file) {struct vchiq_state *state =vchiq_get_state (); -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;vchiq_log_info (vchiq_arm_log_level,"vchiq_open" );
@@ -1951,7 +1951,7 @@ static int vchiq_open(struct inode *inode, struct file *file)static int vchiq_release (struct inode *inode,struct file *file) { -VCHIQ_INSTANCE_T instance = file->private_data; +struct vchiq_instance *instance = file->private_data;struct vchiq_state *state =vchiq_get_state ();struct vchiq_service *service;int ret =0 ;
@@ -2130,7 +2130,7 @@ vchiq_dump_platform_instances(void *dump_context)for (i =0 ; i < state->unused_service; i++) {struct vchiq_service *service = state->services[i]; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;if (service && (service->base.callback == service_callback)) { instance = service->instance;
@@ -2141,7 +2141,7 @@ vchiq_dump_platform_instances(void *dump_context)for (i =0 ; i < state->unused_service; i++) {struct vchiq_service *service = state->services[i]; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;if (service && (service->base.callback == service_callback)) { instance = service->instance;
@@ -2288,7 +2288,7 @@ vchiq_keepalive_thread_func(void *v)struct vchiq_arm_state *arm_state =vchiq_platform_get_arm_state (state);enum vchiq_status status; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;unsigned int ka_handle;struct vchiq_service_params params = {
@@ -2911,13 +2911,13 @@ vchiq_release_service_internal(struct vchiq_service *service) }struct vchiq_debugfs_node * -vchiq_instance_get_debugfs_node (VCHIQ_INSTANCE_T instance) +vchiq_instance_get_debugfs_node (struct vchiq_instance *instance) {return &instance->debugfs_node; }int -vchiq_instance_get_use_count (VCHIQ_INSTANCE_T instance) +vchiq_instance_get_use_count (struct vchiq_instance *instance) {struct vchiq_service *service;int use_count =0 , i;
@@ -2932,19 +2932,19 @@ vchiq_instance_get_use_count(VCHIQ_INSTANCE_T instance) }int -vchiq_instance_get_pid (VCHIQ_INSTANCE_T instance) +vchiq_instance_get_pid (struct vchiq_instance *instance) {return instance->pid; }int -vchiq_instance_get_trace (VCHIQ_INSTANCE_T instance) +vchiq_instance_get_trace (struct vchiq_instance *instance) {return instance->trace; }void -vchiq_instance_set_trace (VCHIQ_INSTANCE_T instance,int trace) +vchiq_instance_set_trace (struct vchiq_instance *instance,int trace) {struct vchiq_service *service;int i;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +5 -5
@@ -162,19 +162,19 @@ vchiq_release_internal(struct vchiq_state *state, struct vchiq_service *service);extern struct vchiq_debugfs_node * -vchiq_instance_get_debugfs_node (VCHIQ_INSTANCE_T instance); +vchiq_instance_get_debugfs_node (struct vchiq_instance *instance);extern int -vchiq_instance_get_use_count (VCHIQ_INSTANCE_T instance); +vchiq_instance_get_use_count (struct vchiq_instance *instance);extern int -vchiq_instance_get_pid (VCHIQ_INSTANCE_T instance); +vchiq_instance_get_pid (struct vchiq_instance *instance);extern int -vchiq_instance_get_trace (VCHIQ_INSTANCE_T instance); +vchiq_instance_get_trace (struct vchiq_instance *instance);extern void -vchiq_instance_set_trace (VCHIQ_INSTANCE_T instance,int trace); +vchiq_instance_set_trace (struct vchiq_instance *instance,int trace); extern void set_suspend_state(struct vchiq_arm_state *arm_state,
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +6 -6
@@ -177,7 +177,7 @@ find_service_by_port(struct vchiq_state *state, int localport) }struct vchiq_service * -find_service_for_instance (VCHIQ_INSTANCE_T instance, +find_service_for_instance (struct vchiq_instance *instance,unsigned int handle) {struct vchiq_service *service;
@@ -201,7 +201,7 @@ find_service_for_instance(VCHIQ_INSTANCE_T instance, }struct vchiq_service * -find_closed_service_for_instance (VCHIQ_INSTANCE_T instance, +find_closed_service_for_instance (struct vchiq_instance *instance,unsigned int handle) {struct vchiq_service *service;
@@ -227,7 +227,7 @@ find_closed_service_for_instance(VCHIQ_INSTANCE_T instance, }struct vchiq_service * -next_service_by_instance (struct vchiq_state *state,VCHIQ_INSTANCE_T instance, +next_service_by_instance (struct vchiq_state *state,struct vchiq_instance *instance,int *pidx) {struct vchiq_service *service =NULL ;
@@ -2280,7 +2280,7 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero)struct vchiq_service *vchiq_add_service_internal (struct vchiq_state *state,const struct vchiq_service_params *params, -int srvstate,VCHIQ_INSTANCE_T instance, +int srvstate,struct vchiq_instance *instance,void (*userdata_term)(void *userdata)) {struct vchiq_service *service;
@@ -2775,7 +2775,7 @@ vchiq_free_service_internal(struct vchiq_service *service) }enum vchiq_status -vchiq_connect_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance) +vchiq_connect_internal (struct vchiq_state *state,struct vchiq_instance *instance) {struct vchiq_service *service;int i;
@@ -2811,7 +2811,7 @@ vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance) }enum vchiq_status -vchiq_shutdown_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance) +vchiq_shutdown_internal (struct vchiq_state *state,struct vchiq_instance *instance) {struct vchiq_service *service;int i;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +12 -14
@@ -207,8 +207,6 @@ enum vchiq_bulk_dir {VCHIQ_BULK_RECEIVE }; -typedef void (*VCHIQ_USERDATA_TERM_T )(void *userdata); -struct vchiq_bulk {short mode;short dir;
@@ -236,7 +234,7 @@ struct remote_event {u32 __unused; }; -typedef struct opaque_platform_state_t *VCHIQ_PLATFORM_STATE_T ; +struct opaque_platform_state ;struct vchiq_slot {char data[VCHIQ_SLOT_SIZE ];
@@ -253,7 +251,7 @@ struct vchiq_service {unsigned int handle;unsigned int ref_count;int srvstate; -VCHIQ_USERDATA_TERM_T userdata_term; +void (*userdata_term)(void *userdata);unsigned int localport;unsigned int remoteport;int public_fourcc;
@@ -268,7 +266,7 @@ struct vchiq_service {short peer_version;struct vchiq_state *state; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;int service_use_count;
@@ -382,7 +380,7 @@ struct vchiq_state {/* Mutex protecting services */ struct mutex mutex; -VCHIQ_INSTANCE_T *instance; +struct vchiq_instance **instance;/* Processes incoming messages */ struct task_struct *slot_handler_thread;
@@ -468,7 +466,7 @@ struct vchiq_state {struct vchiq_service_quota service_quotas[VCHIQ_MAX_SERVICES ];struct vchiq_slot_info slot_info[VCHIQ_MAX_SLOTS ]; -VCHIQ_PLATFORM_STATE_T platform_state; +struct opaque_platform_state *platform_state; };struct bulk_waiter {
@@ -495,13 +493,13 @@ extern enum vchiq_status vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero);extern enum vchiq_status -vchiq_connect_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance); +vchiq_connect_internal (struct vchiq_state *state,struct vchiq_instance *instance);extern struct vchiq_service *vchiq_add_service_internal (struct vchiq_state *state,const struct vchiq_service_params *params, -int srvstate,VCHIQ_INSTANCE_T instance, -VCHIQ_USERDATA_TERM_T userdata_term); +int srvstate,struct vchiq_instance *instance, +void (*userdata_term)(void *userdata));extern enum vchiq_status vchiq_open_service_internal (struct vchiq_service *service,int client_id);
@@ -516,7 +514,7 @@ extern void vchiq_free_service_internal(struct vchiq_service *service);extern enum vchiq_status -vchiq_shutdown_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance); +vchiq_shutdown_internal (struct vchiq_state *state,struct vchiq_instance *instance);extern void remote_event_pollall (struct vchiq_state *state);
@@ -560,15 +558,15 @@ extern struct vchiq_service * find_service_by_port(struct vchiq_state *state, int localport);extern struct vchiq_service * -find_service_for_instance (VCHIQ_INSTANCE_T instance, +find_service_for_instance (struct vchiq_instance *instance,unsigned int handle);extern struct vchiq_service * -find_closed_service_for_instance (VCHIQ_INSTANCE_T instance, +find_closed_service_for_instance (struct vchiq_instance *instance,unsigned int handle);extern struct vchiq_service * -next_service_by_instance (struct vchiq_state *state,VCHIQ_INSTANCE_T instance, +next_service_by_instance (struct vchiq_state *state,struct vchiq_instance *instance,int *pidx); extern void
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +7 -7
@@ -117,7 +117,7 @@ static const struct file_operations debugfs_log_fops = {static int debugfs_usecount_show (struct seq_file *f,void *offset) { -VCHIQ_INSTANCE_T instance = f->private; +struct vchiq_instance *instance = f->private;int use_count; use_count =vchiq_instance_get_use_count (instance);
@@ -129,7 +129,7 @@ DEFINE_SHOW_ATTRIBUTE(debugfs_usecount);static int debugfs_trace_show (struct seq_file *f,void *offset) { -VCHIQ_INSTANCE_T instance = f->private; +struct vchiq_instance *instance = f->private;int trace; trace =vchiq_instance_get_trace (instance);
@@ -148,7 +148,7 @@ static ssize_t debugfs_trace_write(struct file *file, size_t count, loff_t *ppos) { struct seq_file *f = (struct seq_file *)file->private_data; -VCHIQ_INSTANCE_T instance = f->private; +struct vchiq_instance *instance = f->private;char firstchar;if (copy_from_user (&firstchar, buffer,1 ))
@@ -184,7 +184,7 @@ static const struct file_operations debugfs_trace_fops = { };/* add an instance (process) to the debugfs entries */ -void vchiq_debugfs_add_instance (VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_add_instance (struct vchiq_instance *instance) {char pidstr[16 ];struct dentry *top;
@@ -201,7 +201,7 @@ void vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance)vchiq_instance_get_debugfs_node (instance)->dentry = top; } -void vchiq_debugfs_remove_instance (VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_remove_instance (struct vchiq_instance *instance) {struct vchiq_debugfs_node *node =vchiq_instance_get_debugfs_node (instance);
@@ -242,11 +242,11 @@ void vchiq_debugfs_deinit(void) { } -void vchiq_debugfs_add_instance (VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_add_instance (struct vchiq_instance *instance) { } -void vchiq_debugfs_remove_instance (VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_remove_instance (struct vchiq_instance *instance) { }
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h +2 -2
@@ -14,8 +14,8 @@ void vchiq_debugfs_init(void);void vchiq_debugfs_deinit (void ); -void vchiq_debugfs_add_instance (VCHIQ_INSTANCE_T instance); +void vchiq_debugfs_add_instance (struct vchiq_instance *instance); -void vchiq_debugfs_remove_instance (VCHIQ_INSTANCE_T instance); +void vchiq_debugfs_remove_instance (struct vchiq_instance *instance);#endif /* VCHIQ_DEBUGFS_H */
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +13 -12
@@ -61,10 +61,11 @@ struct vchiq_element {unsigned int size; }; +struct vchiq_service_base {int fourcc;enum vchiq_status (*callback)(enum vchiq_reason , -struct vchiq_header *, +struct vchiq_header *,unsigned int ,void *);void *userdata; };
@@ -72,8 +73,8 @@ struct vchiq_service_base {struct vchiq_service_params {int fourcc;enum vchiq_status (*callback)(enum vchiq_reason , -struct vchiq_header *, -unsigned int ,void *); +struct vchiq_header *, +unsigned int ,void *);void *userdata;short version;/* Increment for non-trivial changes */ short version_min;/* Update for incompatible changes */
@@ -90,15 +91,15 @@ struct vchiq_config {short version_min;/* The minimum compatible version of VCHIQ */ }; -typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T ; +struct vchiq_instance ; -extern enum vchiq_status vchiq_initialise (VCHIQ_INSTANCE_T *pinstance); -extern enum vchiq_status vchiq_shutdown (VCHIQ_INSTANCE_T instance); -extern enum vchiq_status vchiq_connect (VCHIQ_INSTANCE_T instance); -extern enum vchiq_status vchiq_add_service (VCHIQ_INSTANCE_T instance, +extern enum vchiq_status vchiq_initialise (struct vchiq_instance **pinstance); +extern enum vchiq_status vchiq_shutdown (struct vchiq_instance *instance); +extern enum vchiq_status vchiq_connect (struct vchiq_instance *instance); +extern enum vchiq_status vchiq_add_service (struct vchiq_instance *instance,const struct vchiq_service_params *params,unsigned int *pservice); -extern enum vchiq_status vchiq_open_service (VCHIQ_INSTANCE_T instance, +extern enum vchiq_status vchiq_open_service (struct vchiq_instance *instance,const struct vchiq_service_params *params,unsigned int *pservice);extern enum vchiq_status vchiq_close_service (unsigned int service);
@@ -132,9 +133,9 @@ extern void vchiq_get_config(struct vchiq_config *config);extern enum vchiq_status vchiq_set_service_option (unsigned int service,enum vchiq_service_option option,int value); -extern enum vchiq_status vchiq_remote_use (VCHIQ_INSTANCE_T instance, -void (*callback)(void *cb_arg),void *cb_arg); -extern enum vchiq_status vchiq_remote_release (VCHIQ_INSTANCE_T instance); +extern enum vchiq_status vchiq_remote_use (struct vchiq_instance *instance, +void (*callback)(void *cb_arg),void *cb_arg); +extern enum vchiq_status vchiq_remote_release (struct vchiq_instance *instance);extern enum vchiq_status vchiq_dump_phys_mem (unsigned int service,void *ptr,size_t num_bytes);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +5 -5
@@ -440,7 +440,7 @@ EXPORT_SYMBOL(vchi_msg_hold);int32_t vchi_initialise (struct vchi_instance_handle **instance_handle) { -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;enum vchiq_status status; status =vchiq_initialise (&instance);
@@ -464,7 +464,7 @@ EXPORT_SYMBOL(vchi_initialise);***********************************************************/ int32_t vchi_connect (struct vchi_instance_handle *instance_handle) { -VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T )instance_handle; +struct vchiq_instance *instance = (struct vchiq_instance *)instance_handle;return vchiq_connect (instance); }
@@ -483,7 +483,7 @@ EXPORT_SYMBOL(vchi_connect);***********************************************************/ int32_t vchi_disconnect (struct vchi_instance_handle *instance_handle) { -VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T )instance_handle; +struct vchiq_instance *instance = (struct vchiq_instance *)instance_handle;return vchiq_status_to_vchi (vchiq_shutdown (instance)); }
@@ -565,7 +565,7 @@ static enum vchiq_status shim_callback(enum vchiq_reason reason,return VCHIQ_SUCCESS ; } -static struct shim_service *service_alloc (VCHIQ_INSTANCE_T instance, +static struct shim_service *service_alloc (struct vchiq_instance *instance,struct service_creation *setup) {struct shim_service *service =kzalloc (sizeof (struct shim_service ),GFP_KERNEL );
@@ -597,7 +597,7 @@ int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,struct service_creation *setup, struct vchi_service_handle **handle) { - VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle; + struct vchiq_instance *instance = (struct vchiq_instance *)instance_handle;struct shim_service *service =service_alloc (instance, setup); *handle = (struct vchi_service_handle *)service;
Signature · 1 line
2.17.1
Greg KH
maintainerRe: [PATCH v2 1/7] staging: vc04_services: Remove enum typedefs in vchi
In reply to Jamal Shareefdrivers/staging/vc04_services/interface/vchi/vchi_common.h struct vchi_msg_vector { · line 119
Quoted 5 lines · Jamal Shareef
drivers/staging/vc04_services/interface/vchi/vchi_common.h +0
-5-// Opaque type for a connection API -typedef struct opaque_vchi_connection_api_t VCHI_CONNECTION_API_T ; - -// Opaque type for a message driver -typedef struct opaque_vchi_message_driver_t VCHI_MESSAGE_DRIVER_T ;
These are not enum typedefs, as your subject line said you were doing :(
Please fix up and redo the series as a new version.
thanks,
greg k-h