Commit dcfbf457 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

staging: vchiq: Use vchiq.h as the main header file for services 



This used to be vchiq_if.h but vchiq.h is more concise for an include
file that will hopefully be in the future in the includes directory.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629150945.10720-46-nsaenzjulienne@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d212a83

drivers/staging/vc04_services/bcm2835-audio/bcm2835.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm-indirect.h>

#include "interface/vchiq_arm/vchiq_if.h"

#include "interface/vchiq_arm/vchiq.h"



#define MAX_SUBSTREAMS   (8)

#define AVAIL_SUBSTREAMS_MASK  (0xff)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h

+103 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/* Copyright (c) 2010-2012 Broadcom. All rights reserved. */



#ifndef VCHIQ_VCHIQ_H

#define VCHIQ_VCHIQ_H

#ifndef VCHIQ_H

#define VCHIQ_H



#include "vchiq_if.h"

#define VCHIQ_SERVICE_HANDLE_INVALID 0



#endif
 
#define VCHIQ_SLOT_SIZE     4096

#define VCHIQ_MAX_MSG_SIZE  (VCHIQ_SLOT_SIZE - sizeof(struct vchiq_header))



#define VCHIQ_MAKE_FOURCC(x0, x1, x2, x3) \

			(((x0) << 24) | ((x1) << 16) | ((x2) << 8) | (x3))



enum vchiq_reason {

	VCHIQ_SERVICE_OPENED,         /* service, -, -             */

	VCHIQ_SERVICE_CLOSED,         /* service, -, -             */

	VCHIQ_MESSAGE_AVAILABLE,      /* service, header, -        */

	VCHIQ_BULK_TRANSMIT_DONE,     /* service, -, bulk_userdata */

	VCHIQ_BULK_RECEIVE_DONE,      /* service, -, bulk_userdata */

	VCHIQ_BULK_TRANSMIT_ABORTED,  /* service, -, bulk_userdata */

	VCHIQ_BULK_RECEIVE_ABORTED    /* service, -, bulk_userdata */

};



enum vchiq_status {

	VCHIQ_ERROR   = -1,

	VCHIQ_SUCCESS = 0,

	VCHIQ_RETRY   = 1

};



enum vchiq_bulk_mode {

	VCHIQ_BULK_MODE_CALLBACK,

	VCHIQ_BULK_MODE_BLOCKING,

	VCHIQ_BULK_MODE_NOCALLBACK,

	VCHIQ_BULK_MODE_WAITING		/* Reserved for internal use */

};



enum vchiq_service_option {

	VCHIQ_SERVICE_OPTION_AUTOCLOSE,

	VCHIQ_SERVICE_OPTION_SLOT_QUOTA,

	VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA,

	VCHIQ_SERVICE_OPTION_SYNCHRONOUS,

	VCHIQ_SERVICE_OPTION_TRACE

};



struct vchiq_header {

	/* The message identifier - opaque to applications. */

	int msgid;



	/* Size of message data. */

	unsigned int size;



	char data[0];           /* message */

};



struct vchiq_element {

	const void __user *data;

	unsigned int size;

};



struct vchiq_service_base {

	int fourcc;

	enum vchiq_status (*callback)(enum vchiq_reason reason,

				      struct vchiq_header *header,

				      unsigned int handle,

				      void *bulk_userdata);

	void *userdata;

};



struct vchiq_service_params {

	int fourcc;

	enum vchiq_status (*callback)(enum vchiq_reason reason,

				      struct vchiq_header *header,

				      unsigned int handle,

				      void *bulk_userdata);

	void *userdata;

	short version;       /* Increment for non-trivial changes */

	short version_min;   /* Update for incompatible changes */

};



struct vchiq_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_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);

extern enum vchiq_status vchiq_use_service(unsigned int service);

extern enum vchiq_status vchiq_release_service(unsigned int service);

extern void vchiq_msg_queue_push(unsigned handle, struct vchiq_header *header);

extern void           vchiq_release_message(unsigned int service,

	struct vchiq_header *header);

extern int vchiq_queue_kernel_message(unsigned handle, void *data,

				      unsigned size);

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(unsigned int service,

	void *data, unsigned int size, void *userdata,

	enum vchiq_bulk_mode mode);

extern void *vchiq_get_service_userdata(unsigned int service);

extern enum vchiq_status vchiq_get_peer_version(unsigned int handle,

      short *peer_version);

extern struct vchiq_header *vchiq_msg_hold(unsigned handle);



#endif /* VCHIQ_H */

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h

deleted100644 → 0
+0 −109
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/* Copyright (c) 2010-2012 Broadcom. All rights reserved. */



#ifndef VCHIQ_IF_H

#define VCHIQ_IF_H



#define VCHIQ_SERVICE_HANDLE_INVALID 0



#define VCHIQ_SLOT_SIZE     4096

#define VCHIQ_MAX_MSG_SIZE  (VCHIQ_SLOT_SIZE - sizeof(struct vchiq_header))



#define VCHIQ_MAKE_FOURCC(x0, x1, x2, x3) \

			(((x0) << 24) | ((x1) << 16) | ((x2) << 8) | (x3))



enum vchiq_reason {

	VCHIQ_SERVICE_OPENED,         /* service, -, -             */

	VCHIQ_SERVICE_CLOSED,         /* service, -, -             */

	VCHIQ_MESSAGE_AVAILABLE,      /* service, header, -        */

	VCHIQ_BULK_TRANSMIT_DONE,     /* service, -, bulk_userdata */

	VCHIQ_BULK_RECEIVE_DONE,      /* service, -, bulk_userdata */

	VCHIQ_BULK_TRANSMIT_ABORTED,  /* service, -, bulk_userdata */

	VCHIQ_BULK_RECEIVE_ABORTED    /* service, -, bulk_userdata */

};



enum vchiq_status {

	VCHIQ_ERROR   = -1,

	VCHIQ_SUCCESS = 0,

	VCHIQ_RETRY   = 1

};



enum vchiq_bulk_mode {

	VCHIQ_BULK_MODE_CALLBACK,

	VCHIQ_BULK_MODE_BLOCKING,

	VCHIQ_BULK_MODE_NOCALLBACK,

	VCHIQ_BULK_MODE_WAITING		/* Reserved for internal use */

};



enum vchiq_service_option {

	VCHIQ_SERVICE_OPTION_AUTOCLOSE,

	VCHIQ_SERVICE_OPTION_SLOT_QUOTA,

	VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA,

	VCHIQ_SERVICE_OPTION_SYNCHRONOUS,

	VCHIQ_SERVICE_OPTION_TRACE

};



struct vchiq_header {

	/* The message identifier - opaque to applications. */

	int msgid;



	/* Size of message data. */

	unsigned int size;



	char data[0];           /* message */

};



struct vchiq_element {

	const void __user *data;

	unsigned int size;

};



struct vchiq_service_base {

	int fourcc;

	enum vchiq_status (*callback)(enum vchiq_reason reason,

				      struct vchiq_header *header,

				      unsigned int handle,

				      void *bulk_userdata);

	void *userdata;

};



struct vchiq_service_params {

	int fourcc;

	enum vchiq_status (*callback)(enum vchiq_reason reason,

				      struct vchiq_header *header,

				      unsigned int handle,

				      void *bulk_userdata);

	void *userdata;

	short version;       /* Increment for non-trivial changes */

	short version_min;   /* Update for incompatible changes */

};



struct vchiq_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_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);

extern enum vchiq_status vchiq_use_service(unsigned int service);

extern enum vchiq_status vchiq_release_service(unsigned int service);

extern int vchiq_queue_kernel_message(unsigned handle, void *data,

				      unsigned size);

extern void vchiq_msg_queue_push(unsigned handle, struct vchiq_header *header);

extern void           vchiq_release_message(unsigned int service,

	struct vchiq_header *header);

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(unsigned int service,

	void *data, unsigned int size, void *userdata,

	enum vchiq_bulk_mode mode);

extern void *vchiq_get_service_userdata(unsigned int service);

extern enum vchiq_status vchiq_get_peer_version(unsigned int handle,

      short *peer_version);

extern void vchiq_msg_queue_push(unsigned handle, struct vchiq_header *header);

extern struct vchiq_header *vchiq_msg_hold(unsigned handle);



#endif /* VCHIQ_IF_H */

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#define VCHIQ_IOCTLS_H



#include <linux/ioctl.h>

#include "vchiq_if.h"

#include "vchiq.h"



#define VCHIQ_IOC_MAGIC 0xc4

#define VCHIQ_INVALID_HANDLE (~0)

drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "mmal-vchiq.h"

#include "mmal-msg.h"



#include "interface/vchiq_arm/vchiq_if.h"

#include "interface/vchiq_arm/vchiq.h"



/*

 * maximum number of components supported.