raspi/userland
1
0
Fork 0
mirror of https://github.com/raspberrypi/userland.git synced 2025-12-06 04:49:12 +00:00
Code Issues Projects Releases Wiki Activity

Adjust include paths for Linux/BSD

Browse Source 
See: https://github.com/raspberrypi/userland/pull/298
This commit is contained in:
John Greb
2016-03-14 11:17:47 +00:00
committed by popcornmix
parent ed59ee1f17
commit 826b0b1b08
39 changed files with 79 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/vcos/pthreads/vcos_platform.h Executable file → Normal file
View File

@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
VideoCore OS Abstraction Layer - pthreads types
=============================================================================*/
/* Do not include this file directly - instead include it via vcos.h */
/* DO NOT include this file directly - instead include it via vcos.h */
/** @file
*

5
interface/vcos/vcos.h
View File

@@ -113,7 +113,12 @@ VideoCore OS Abstraction Layer - public header file
#include "interface/vcos/vcos_assert.h"
#include "vcos_types.h"
#if defined(__unix__) && !defined(__ANDROID__)
#include "interface/vcos/pthreads/vcos_platform.h"
#else
#include "vcos_platform.h"
#endif
#ifndef VCOS_INIT_H
#include "interface/vcos/vcos_init.h"

2
interface/vcos/vcos_atomic_flags.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/**
* \file vcos_atomic_flags.h

2
interface/vcos/vcos_blockpool.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/** \file
*

2
interface/vcos/vcos_cfg.h
View File

@@ -33,7 +33,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
typedef struct opaque_vcos_cfg_buf_t *VCOS_CFG_BUF_T;
typedef struct opaque_vcos_cfg_entry_t *VCOS_CFG_ENTRY_T;

3
interface/vcos/vcos_cmd.h
View File

@@ -86,7 +86,8 @@ VCOSPRE_ void VCOSPOST_ vcos_cmd_vprintf( VCOS_CMD_PARAM_T *param, const char *f
* vcos_cmd_execute is used as a line buffer and does not need to be
* output by the caller.
*/
VCOSPRE_ void VCOSPOST_ vcos_cmd_always_log_output( VCOS_LOG_CAT_T *log_category );
struct VCOS_LOG_CAT_T;
VCOSPRE_ void VCOSPOST_ vcos_cmd_always_log_output( struct VCOS_LOG_CAT_T *log_category );
/*
* Prints command usage for the current command.

2
interface/vcos/vcos_dlfcn.h
View File

@@ -33,7 +33,7 @@ VCOS - abstraction over dynamic library opening
#define VCOS_DLFCN_H
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
#ifdef __cplusplus
extern "C" {

2
interface/vcos/vcos_event.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/**
* \file

2
interface/vcos/vcos_event_flags.h
View File

@@ -38,7 +38,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
#define VCOS_EVENT_FLAGS_SUSPEND VCOS_SUSPEND
#define VCOS_EVENT_FLAGS_NO_SUSPEND VCOS_NO_SUSPEND

2
interface/vcos/vcos_init.h
View File

@@ -31,7 +31,7 @@ VideoCore OS Abstraction Layer - initialization routines
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
#ifdef __cplusplus
extern "C" {

2
interface/vcos/vcos_isr.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/**
* \file vcos_isr.h

2
interface/vcos/vcos_legacy_isr.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/** \file vcos_legacy_isr.h
*

2
interface/vcos/vcos_logging.h
View File

@@ -39,7 +39,7 @@ extern "C" {
#include <stdarg.h>
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
#include "vcos_logging_control.h"
/**

2
interface/vcos/vcos_lowlevel_thread.h
View File

@@ -38,7 +38,7 @@ extern "C" {
#include "interface/vcos/vcos_types.h"
#ifndef VCOS_PLATFORM_H
#include "vcos_platform.h"
#include "vcos.h"
#endif
/**

2
interface/vcos/vcos_mem.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/** \file
*

2
interface/vcos/vcos_mempool.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/** \file
*

2
interface/vcos/vcos_msgqueue.h
View File

@@ -44,7 +44,7 @@ extern "C" {
#endif
#include "vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
#include "vcos_blockpool.h"
/**

2
interface/vcos/vcos_mutex.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/**
* \file vcos_mutex.h

2
interface/vcos/vcos_named_semaphore.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/**
* \file

2
interface/vcos/vcos_once.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/**
* \file vcos_once.h

2
interface/vcos/vcos_queue.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/** \file vcos_queue.h
*

2
interface/vcos/vcos_quickslow_mutex.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/**
* \file vcos_quickslow_mutex.h

2
interface/vcos/vcos_reentrant_mutex.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/**
* \file

2
interface/vcos/vcos_semaphore.h
View File

@@ -38,7 +38,7 @@ extern "C" {
#include "interface/vcos/vcos_types.h"
#ifndef VCOS_PLATFORM_H
#include "vcos_platform.h"
#include "vcos.h"
#endif
/**

2
interface/vcos/vcos_string.h
View File

@@ -44,7 +44,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
#ifdef __KERNEL__
#include <linux/string.h>

2
interface/vcos/vcos_thread.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/**
* \file vcos_thread.h

2
interface/vcos/vcos_timer.h
View File

@@ -38,7 +38,7 @@ extern "C" {
#include "interface/vcos/vcos_types.h"
#ifndef VCOS_PLATFORM_H
#include "vcos_platform.h"
#include "vcos.h"
#endif
/** \file vcos_timer.h

2
interface/vcos/vcos_tls.h
View File

@@ -37,7 +37,7 @@ extern "C" {
#endif
#include "interface/vcos/vcos_types.h"
#include "vcos_platform.h"
#include "vcos.h"
/** Create a new thread local storage data key visible to all threads in

6
interface/vcos/vcos_types.h
View File

@@ -35,11 +35,15 @@ VideoCore OS Abstraction Layer - basic types
#define VCOS_VERSION 1
#include <stddef.h>
#if defined(__unix__) && !defined(__ANDROID__)
#include "interface/vcos/pthreads/vcos_platform_types.h"
#else
#include "vcos_platform_types.h"
#endif
#include "interface/vcos/vcos_attr.h"
#if !defined(VCOSPRE_) || !defined(VCOSPOST_)
#error VCOSPRE_ and VCOSPOST_ not defined!
#error VCOSPRE_ or VCOSPOST_ not defined!
#endif
/* Redefine these here; this means that existing header files can carry on

2
interface/vmcs_host/vc_vchi_cecservice.c
View File

@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <string.h>
#include <stdio.h>
#include "vchost_config.h"
#include "vchost_platform_config.h"
#include "vchost.h"
#include "interface/vcos/vcos.h"

2
interface/vmcs_host/vc_vchi_dispmanx.c
View File

@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string.h>
#include <stdlib.h>
#include "vchost_config.h"
#include "vchost_platform_config.h"
#include "vchost.h"
#include "interface/vcos/vcos.h"

2
interface/vmcs_host/vc_vchi_filesys.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef VC_VCHI_VCFILESYS_H_
#define VC_VCHI_VCFILESYS_H_
#include "vchost_config.h"
#include "vchost_platform_config.h"
#include "vcfilesys_defs.h"
#include "vc_fileservice_defs.h"
#include "interface/vchi/vchi.h"

2
interface/vmcs_host/vc_vchi_gencmd.h
View File

@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef VC_VCHI_GENCMD_H
#define VC_VCHI_GENCMD_H
#include "vchost_config.h"
#include "vchost_platform_config.h"
#include "interface/vchi/vchi.h"
#include "interface/vcos/vcos.h" //for VCHPRE_ abd VCHPOST_ macro's for func declaration

2
interface/vmcs_host/vc_vchi_tvservice.c
View File

@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "interface/vcos/vcos.h"
#include "vchost_config.h"
#include "vchost_platform_config.h"
#include "vchost.h"
#include "interface/vchi/vchi.h"

2
interface/vmcs_host/vcfilesys.h
View File

@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "vchost_config.h"
#include "vchost_platform_config.h"
#include "vcfilesys_defs.h"
#include "vc_fileservice_defs.h"

2
interface/vmcs_host/vcgencmd.h
View File

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef GENCMD_H
#define GENCMD_H
#include "vchost_config.h"
#include "vchost_platform_config.h"
#include "interface/vchi/vchi.h"
VCHPRE_ void VCHPOST_ vc_vchi_gencmd_init(VCHI_INSTANCE_T initialise_instance, VCHI_CONNECTION_T **connections, uint32_t num_connections );

2
interface/vmcs_host/vchost.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef VCHOST_H
#define VCHOST_H
#include "vchost_config.h"
#include "vchost_platform_config.h"
#include "vcfilesys_defs.h"
#include "interface/vcos/vcos.h" //for VCHPRE_ abd VCHPOST_ macro's for func declaration
#include "interface/vmcs_host/vc_fileservice_defs.h" // for VC_O_XXX file definitions

32
interface/vmcs_host/vchost_platform_config.h Normal file
View File

@@ -0,0 +1,32 @@
/*
Copyright (c) 2016, Raspberry Pi (Trading) Ltd
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the copyright holder nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if defined(__unix__) && !defined(__ANDROID__)
#include "linux/vchost_config.h"
#else
#include "vchost_config.h"
#endif

2
interface/vmcs_host/vchostreq.h
View File

@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define VCHOSTREQ_H
#include "vc_hostreq_defs.h"
#include "vchost_config.h"
#include "vchost_platform_config.h"
#include <time.h>
#include "interface/vchi/vchi.h"