Skip to content

L
linux
Commit 31370f7e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: csr: remove __cplusplus nonsense from the .h files 

In the kernel, we use C.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1bbffe72
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 611 deletions
drivers/staging/csr/csr_framework_ext.h
View file @ 31370f7e
......@@ -13,10 +13,6 @@
#include "csr_result.h"
#include "csr_framework_ext_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/* Result codes */
#define CSR_FE_RESULT_NO_MORE_EVENTS ((CsrResult) 0x0001)
#define CSR_FE_RESULT_INVALID_POINTER ((CsrResult) 0x0002)
......@@ -36,8 +32,4 @@ extern "C" {
void CsrThreadSleep(u16 sleepTimeInMs);
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_framework_ext_types.h
View file @ 31370f7e
......@@ -17,11 +17,6 @@
#include <pthread.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __KERNEL__
struct CsrEvent {
......@@ -46,8 +41,4 @@ typedef pthread_mutex_t CsrMutexHandle;
#endif /* __KERNEL__ */
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_lib.h
View file @ 31370f7e
......@@ -12,10 +12,6 @@
#include "csr_prim_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct
{
CsrPrim type;
......@@ -181,8 +177,4 @@ typedef struct
*----------------------------------------------------------------------------*/
CsrEventCsrUint32CsrCharString *CsrEventCsrUint32CsrCharString_struct(u16 primtype, u16 msgtype, u32 value1, char *value2);
#ifdef __cplusplus
}
#endif
#endif /* CSR_LIB_H__ */
drivers/staging/csr/csr_log.h
View file @ 31370f7e
......@@ -14,10 +14,6 @@
#include "csr_prim_defs.h"
#include "csr_msgconv.h"
#ifdef __cplusplus
extern "C" {
#endif
/*
* Log filtering
*/
......@@ -224,8 +220,4 @@ void CsrLogExceptionWarning(u16 prim_type,
u32 line,
const char *file);
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_log_configure.h
View file @ 31370f7e
......@@ -12,10 +12,6 @@
#include "csr_log.h"
#ifdef __cplusplus
extern "C" {
#endif
/*---------------------------------*/
/* Log init/deinit */
/*---------------------------------*/
......@@ -127,8 +123,4 @@ void CsrLogLevelTextSet(const char *originName,
const char *subOriginName,
CsrLogLevelText warningLevelMask);
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_log_text.h
View file @ 31370f7e
......@@ -12,10 +12,6 @@
#include "csr_log_configure.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct CsrLogSubOrigin
{
u16 subOriginNumber; /* Id of the given SubOrigin */
......@@ -125,8 +121,4 @@ void CsrLogTextBufferDebug(CsrLogTextTaskId taskId, u16 subOrigin, size_t buffer
#define CSR_LOG_TEXT_UNHANDLED_PRIMITIVE(origin, suborigin, primClass, primType)
#endif
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_macro.h
View file @ 31370f7e
......@@ -12,10 +12,6 @@
#include <linux/types.h>
#ifdef __cplusplus
extern "C" {
#endif
#define FALSE (0)
#define TRUE (1)
......@@ -107,8 +103,4 @@ extern "C" {
#define CSR_TOLOWER(character) (((character) >= 'A') && ((character) <= 'Z') ? ((character) + 0x20) : (character))
#define CSR_ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_msg_transport.h
View file @ 31370f7e
......@@ -10,16 +10,8 @@
*****************************************************************************/
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CsrMsgTransport
#define CsrMsgTransport CsrSchedMessagePut
#endif
#ifdef __cplusplus
}
#endif
#endif /* CSR_MSG_TRANSPORT */
drivers/staging/csr/csr_msgconv.h
View file @ 31370f7e
......@@ -15,10 +15,6 @@
#include "csr_prim_defs.h"
#include "csr_sched.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef size_t (CsrMsgSizeofFunc)(void *msg);
typedef u8 *(CsrMsgSerializeFunc)(u8 *buffer, size_t *length, void *msg);
typedef void (CsrMsgFreeFunc)(void *msg);
......@@ -79,9 +75,4 @@ void CsrUint32Des(u32 *value, u8 *buffer, size_t *offset);
void CsrMemCpyDes(void *value, u8 *buffer, size_t *offset, size_t length);
void CsrCharStringDes(char **value, u8 *buffer, size_t *offset);
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_prim_defs.h
View file @ 31370f7e
......@@ -9,9 +9,6 @@
on the license terms.
*****************************************************************************/
#ifdef __cplusplus
extern "C" {
#endif
/************************************************************************************
* Segmentation of primitives in upstream and downstream segment
......@@ -55,8 +52,4 @@ typedef u16 CsrPrim;
#define CSR_ENV_PRIM ((u16) (0x00FF | CSR_SYNERGY_EVENT_CLASS_MISC_BASE))
#ifdef __cplusplus
}
#endif
#endif /* CSR_PRIM_DEFS_H__ */
drivers/staging/csr/csr_result.h
View file @ 31370f7e
......@@ -10,16 +10,8 @@
*****************************************************************************/
#ifdef __cplusplus
extern "C" {
#endif
typedef u16 CsrResult;
#define CSR_RESULT_SUCCESS ((CsrResult) 0x0000)
#define CSR_RESULT_FAILURE ((CsrResult) 0xFFFF)
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_sched.h
View file @ 31370f7e
......@@ -12,10 +12,6 @@
#include <linux/types.h>
#include "csr_time.h"
#ifdef __cplusplus
extern "C" {
#endif
/* An identifier issued by the scheduler. */
typedef u32 CsrSchedIdentifier;
......@@ -86,8 +82,4 @@ void CsrSchedMessagePut(CsrSchedQid q,
void *mv);
#endif
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_sdio.h
View file @ 31370f7e
......@@ -12,10 +12,6 @@
#include "csr_result.h"
#ifdef __cplusplus
extern "C" {
#endif
/* Result Codes */
#define CSR_SDIO_RESULT_INVALID_VALUE ((CsrResult) 1) /* Invalid argument value */
#define CSR_SDIO_RESULT_NO_DEVICE ((CsrResult) 2) /* The specified device is no longer present */
......@@ -724,8 +720,4 @@ CsrResult CsrSdioHardReset(CsrSdioFunction *function);
void CsrSdioFunctionActive(CsrSdioFunction *function);
void CsrSdioFunctionIdle(CsrSdioFunction *function);
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_time.h
View file @ 31370f7e
......@@ -12,10 +12,6 @@ on the license terms.
#include <linux/types.h>
#ifdef __cplusplus
extern "C" {
#endif
/*******************************************************************************
NAME
......@@ -77,8 +73,4 @@ u32 CsrTimeGet(u32 *high);
*----------------------------------------------------------------------------*/
#define CsrTimeSub(t1, t2) ((s32) (t1) - (s32) (t2))
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_wifi_common.h
View file @ 31370f7e
......@@ -14,10 +14,6 @@
#include <linux/types.h>
#include "csr_result.h"
#ifdef __cplusplus
extern "C" {
#endif
/* MAC address */
typedef struct
{
......@@ -101,9 +97,5 @@ typedef struct
#define CSR_WIFI_VERSION "5.1.0.0"
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_wifi_fsm.h
View file @ 31370f7e
......@@ -11,10 +11,6 @@
#ifndef CSR_WIFI_FSM_H
#define CSR_WIFI_FSM_H
#ifdef __cplusplus
extern "C" {
#endif
#include "csr_prim_defs.h"
#include "csr_log_text.h"
#include "csr_wifi_fsm_event.h"
......@@ -240,9 +236,5 @@ extern u8 CsrWifiFsmHasEvents(CsrWifiFsmContext *context);
*/
extern void CsrWifiFsmInstallWakeupCallback(CsrWifiFsmContext *context, CsrWifiFsmExternalWakupCallbackPtr callback);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_FSM_H */
drivers/staging/csr/csr_wifi_fsm_event.h
View file @ 31370f7e
......@@ -11,10 +11,6 @@
#ifndef CSR_WIFI_FSM_EVENT_H
#define CSR_WIFI_FSM_EVENT_H
#ifdef __cplusplus
extern "C" {
#endif
#include "csr_prim_defs.h"
#include "csr_sched.h"
......@@ -42,9 +38,5 @@ typedef struct CsrWifiFsmEvent
struct CsrWifiFsmEvent *next;
} CsrWifiFsmEvent;
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_FSM_EVENT_H */
drivers/staging/csr/csr_wifi_fsm_types.h
View file @ 31370f7e
......@@ -11,10 +11,6 @@
#ifndef CSR_WIFI_FSM_TYPES_H
#define CSR_WIFI_FSM_TYPES_H
#ifdef __cplusplus
extern "C" {
#endif
#include <linux/types.h>
#include "csr_macro.h"
#include "csr_sched.h"
......@@ -431,9 +427,4 @@ struct CsrWifiFsmContext
#endif
};
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_FSM_TYPES_H */
drivers/staging/csr/csr_wifi_hip_card.h
View file @ 31370f7e
......@@ -21,10 +21,6 @@
#ifndef __CARD_H__
#define __CARD_H__
#ifdef __cplusplus
extern "C" {
#endif
#include "csr_wifi_hip_card_sdio.h"
#include "csr_wifi_hip_signals.h"
#include "csr_wifi_hip_unifi_udi.h"
......@@ -115,9 +111,4 @@ void unifi_debug_string_to_buf(const char *str);
void unifi_debug_hex_to_buf(const char *buff, u16 length);
#endif
#ifdef __cplusplus
}
#endif
#endif /* __CARD_H__ */
drivers/staging/csr/csr_wifi_hip_card_sdio.h
View file @ 31370f7e
......@@ -20,10 +20,6 @@
#ifndef __CARD_SDIO_H__
#define __CARD_SDIO_H__
#ifdef __cplusplus
extern "C" {
#endif
#include "csr_wifi_hip_unifi.h"
#include "csr_wifi_hip_unifi_udi.h"
#include "csr_wifi_hip_unifihw.h"
......@@ -695,8 +691,4 @@ CsrResult prealloc_netdata_alloc(card_t *card);
void dump(void *mem, u16 len);
void dump16(void *mem, u16 len);
#ifdef __cplusplus
}
#endif
#endif /* __CARD_SDIO_H__ */
drivers/staging/csr/csr_wifi_hip_chiphelper.h
View file @ 31370f7e
......@@ -14,10 +14,6 @@
#include <linux/types.h>
#ifdef __cplusplus
extern "C" {
#endif
/* The age of the BlueCore chip. This is probably not useful, if
you know the age then you can probably work out the version directly. */
enum chip_helper_bluecore_age
......@@ -408,64 +404,4 @@ s32 ChipHelper_DecodeWindow(ChipDescript *chip_help,
u32 offset,
u16 *page, u16 *addr, u32 *len);
#ifdef __cplusplus
/* Close the extern "C" */
}
/*
* This is the C++ API.
*/
class ChipHelper
{
public:
/* If this constructor is used then a GetVersionXXX function
should be called next. */
ChipHelper();
/* copy constructor */
ChipHelper(ChipDescript * desc);
/* The default constructor assume a BC7 / UF105x series chip
and that the number given is the value of UNIFI_GBL_CHIP_VERSION
(0xFE81) */
ChipHelper(u16 version);
/* This returns the C interface magic token from a C++ instance. */
ChipDescript* GetDescript() const
{
return m_desc;
}
/* Clear out theis class (set it to the null token). */
void ClearVersion();
/* Load this class with data for a specific chip. */
void GetVersionAny(u16 from_FF9A, u16 from_FE81);
void GetVersionUniFi(u16 version);
void GetVersionBlueCore(chip_helper_bluecore_age age, u16 version);
void GetVersionSdio(u8 sdio_version);
/* Helpers to build the definitions of the member functions. */
#define CHIP_HELPER_DEF0_CPP_DEC(ret_type, name, info) \
ret_type name() const;
#define CHIP_HELPER_DEF1_CPP_DEC(ret_type, name, type1, name1) \
ret_type name(type1 name1) const;
CHIP_HELPER_LIST(CPP_DEC)
/* The DecodeWindow function, see the description of the C version. */
s32 DecodeWindow(chip_helper_window_index window,
chip_helper_window_type type,
u32 offset,
u16 &page, u16 &addr, u32 &len) const;
private:
ChipDescript *m_desc;
};
#endif /* __cplusplus */
#endif
drivers/staging/csr/csr_wifi_hip_chiphelper_private.h
View file @ 31370f7e
......@@ -14,10 +14,6 @@
#include "csr_wifi_hip_chiphelper.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* This GP stuff should be somewhere else? */
/* Memory spaces encoded in top byte of Generic Pointer type */
......@@ -201,8 +197,4 @@ struct chip_device_desc_t
const struct window_info_t *windows[CHIP_HELPER_WINDOW_COUNT];
};
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* CSR_WIFI_HIP_CHIPHELPER_PRIVATE_H__ */
drivers/staging/csr/csr_wifi_hip_conversions.h
View file @ 31370f7e
......@@ -23,10 +23,6 @@
#ifndef __CSR_WIFI_HIP_CONVERSIONS_H__
#define __CSR_WIFI_HIP_CONVERSIONS_H__
#ifdef __cplusplus
extern "C" {
#endif
#define SIZEOF_UINT16 2
#define SIZEOF_UINT32 4
#define SIZEOF_UINT64 8
......@@ -73,9 +69,5 @@ s32 get_packed_struct_size(const u8 *buf);
CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig);
CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len);
#ifdef __cplusplus
}
#endif
#endif /* __CSR_WIFI_HIP_CONVERSIONS_H__ */
drivers/staging/csr/csr_wifi_hip_signals.h
View file @ 31370f7e
......@@ -101,10 +101,6 @@
/* FUNCTION DECLARATIONS */
/******************************************************************************/
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/******************************************************************************
* SigGetNumDataRefs - Retrieve pointers to data-refs from a signal.
*
......@@ -129,9 +125,4 @@ s32 SigGetDataRefs(CSR_SIGNAL *aSignal, CSR_DATAREF **aDataRef);
*/
s32 SigGetSize(const CSR_SIGNAL *aSignal);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __CSR_WIFI_HIP_SIGNALS_H__ */
drivers/staging/csr/csr_wifi_hip_sigs.h
View file @ 31370f7e
......@@ -16,10 +16,6 @@
#ifndef CSR_WIFI_HIP_SIGS_H
#define CSR_WIFI_HIP_SIGS_H
#ifdef __cplusplus
extern "C" {
#endif
typedef s16 csr_place_holding_type;
typedef u16 CSR_ASSOCIATION_ID;
......@@ -1418,8 +1414,4 @@ typedef struct CSR_SIGNAL_PRIMITIVE
u32 SigGetFilterPos(u16 aSigID);
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_wifi_hip_ta_sampling.h
View file @ 31370f7e
......@@ -21,10 +21,6 @@
#ifndef __TA_SAMPLING_H__
#define __TA_SAMPLING_H__
#ifdef __cplusplus
extern "C" {
#endif
#include "csr_wifi_hip_unifi.h"
typedef struct ta_l4stats
......@@ -67,9 +63,4 @@ typedef struct ta_data
void unifi_ta_sampling_init(card_t *card);
#ifdef __cplusplus
}
#endif
#endif /* __TA_SAMPLING_H__ */
drivers/staging/csr/csr_wifi_hip_unifi.h
View file @ 31370f7e
......@@ -20,10 +20,6 @@
#ifndef __CSR_WIFI_HIP_UNIFI_H__
#define __CSR_WIFI_HIP_UNIFI_H__ 1
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_HIP_TA_DISABLE
#include "csr_wifi_router_ctrl_prim.h"
#include "csr_wifi_router_prim.h"
......@@ -872,8 +868,4 @@ CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable);
CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers);
void unifi_coredump_free(card_t *card);
#ifdef __cplusplus
}
#endif
#endif /* __CSR_WIFI_HIP_UNIFI_H__ */
drivers/staging/csr/csr_wifi_hip_unifi_udi.h
View file @ 31370f7e
......@@ -20,10 +20,6 @@
#ifndef __CSR_WIFI_HIP_UNIFI_UDI_H__
#define __CSR_WIFI_HIP_UNIFI_UDI_H__
#ifdef __cplusplus
extern "C" {
#endif
#include "csr_wifi_hip_unifi.h"
#include "csr_wifi_hip_signals.h"
......@@ -68,9 +64,4 @@ s32 unifi_print_status(card_t *card, char *str, s32 *remain);
} \
} while (0)
#ifdef __cplusplus
}
#endif
#endif /* __CSR_WIFI_HIP_UNIFI_UDI_H__ */
drivers/staging/csr/csr_wifi_hip_unifihw.h
View file @ 31370f7e
......@@ -20,10 +20,6 @@
#ifndef __UNIFIHW_H__
#define __UNIFIHW_H__ 1
#ifdef __cplusplus
extern "C" {
#endif
/* Symbol Look Up Table fingerprint. IDs are in sigs.h */
#define SLUT_FINGERPRINT 0xD397
......@@ -60,8 +56,4 @@ extern "C" {
#define UNIFI_GP_OFFSET(GP) ((GP) & 0xFFFFFF)
#define UNIFI_GP_SPACE(GP) (((GP) >> 24) & 0xFF)
#ifdef __cplusplus
}
#endif
#endif /* __UNIFIHW_H__ */
drivers/staging/csr/csr_wifi_hip_unifiversion.h
View file @ 31370f7e
......@@ -21,18 +21,10 @@
#ifndef __UNIFIVERSION_H__
#define __UNIFIVERSION_H__
#ifdef __cplusplus
extern "C" {
#endif
/*
* The minimum version of Host Interface Protocol required by the driver.
*/
#define UNIFI_HIP_MAJOR_VERSION 9
#define UNIFI_HIP_MINOR_VERSION 1
#ifdef __cplusplus
}
#endif
#endif /* __UNIFIVERSION_H__ */
drivers/staging/csr/csr_wifi_hip_xbv.h
View file @ 31370f7e
......@@ -21,10 +21,6 @@
#ifndef __XBV_H__
#define __XBV_H__
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_XBV_TEST
/* Driver includes */
#include "csr_wifi_hip_unifi.h"
......@@ -120,8 +116,4 @@ s32 xbv1_read_slut(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo
void* xbv_to_patch(card_t *card, fwreadfn_t readfn, const void *fw_buf, const xbv1_t *fwinfo,
u32 *size);
#ifdef __cplusplus
}
#endif
#endif /* __XBV_H__ */
drivers/staging/csr/csr_wifi_hostio_prim.h
View file @ 31370f7e
......@@ -12,16 +12,7 @@
#ifndef CSR_WIFI_HOSTIO_H
#define CSR_WIFI_HOSTIO_H
#ifdef __cplusplus
extern "C" {
#endif
#define CSR_WIFI_HOSTIO_PRIM 0x0453
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_HOSTIO_H */
drivers/staging/csr/csr_wifi_lib.h
View file @ 31370f7e
......@@ -12,11 +12,6 @@
#include "csr_wifi_fsm_event.h"
#ifdef __cplusplus
extern "C" {
#endif
/*----------------------------------------------------------------------------*
* CsrWifiFsmEventInit
*
......@@ -105,8 +100,4 @@ typedef struct
*----------------------------------------------------------------------------*/
CsrWifiEventCsrUint16CsrUint8* CsrWifiEventCsrUint16CsrUint8_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src, u16 value16, u8 value8);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_LIB_H__ */
drivers/staging/csr/csr_wifi_msgconv.h
View file @ 31370f7e
......@@ -14,11 +14,6 @@
#include "csr_prim_defs.h"
#include "csr_sched.h"
#ifdef __cplusplus
extern "C" {
#endif
void CsrUint16SerBigEndian(u8 *ptr, size_t *len, u16 v);
void CsrUint24SerBigEndian(u8 *ptr, size_t *len, u32 v);
void CsrUint32SerBigEndian(u8 *ptr, size_t *len, u32 v);
......@@ -51,8 +46,4 @@ size_t CsrWifiEventCsrUint16CsrUint8Sizeof(void *msg);
u8* CsrWifiEventCsrUint16CsrUint8Ser(u8 *ptr, size_t *len, void *msg);
void* CsrWifiEventCsrUint16CsrUint8Des(u8 *buffer, size_t length);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_MSGCONV_H__ */
drivers/staging/csr/csr_wifi_nme_ap_converter_init.h
View file @ 31370f7e
......@@ -13,10 +13,6 @@
#ifndef CSR_WIFI_NME_AP_CONVERTER_INIT_H__
#define CSR_WIFI_NME_AP_CONVERTER_INIT_H__
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_NME_ENABLE
#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_converter_init.h
#endif
......@@ -42,8 +38,4 @@ extern void CsrWifiNmeApConverterInit(void);
#endif /* EXCLUDE_CSR_WIFI_NME_AP_MODULE */
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_NME_AP_CONVERTER_INIT_H__ */
drivers/staging/csr/csr_wifi_nme_ap_lib.h
View file @ 31370f7e
......@@ -22,11 +22,6 @@
#include "csr_wifi_nme_ap_prim.h"
#include "csr_wifi_nme_task.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_NME_ENABLE
#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_lib.h
#endif
......@@ -515,9 +510,4 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
#define CsrWifiNmeApWpsRegisterCfmSend(dst__, interfaceTag__, status__) \
CsrWifiNmeApWpsRegisterCfmSendTo(dst__, CSR_WIFI_NME_IFACEQUEUE, interfaceTag__, status__)
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_NME_AP_LIB_H__ */
drivers/staging/csr/csr_wifi_nme_ap_prim.h
View file @ 31370f7e
......@@ -22,10 +22,6 @@
#include "csr_wifi_sme_ap_prim.h"
#include "csr_wifi_nme_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_NME_ENABLE
#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_prim.h
#endif
......@@ -494,10 +490,5 @@ typedef struct
CsrWifiMacAddress peerDeviceAddress;
} CsrWifiNmeApStationInd;
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_NME_AP_PRIM_H__ */
drivers/staging/csr/csr_wifi_nme_ap_sef.h
View file @ 31370f7e
......@@ -11,11 +11,6 @@
#include "csr_wifi_nme_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
void CsrWifiNmeApUpstreamStateHandlers(void* drvpriv, CsrWifiFsmEvent* msg);
......@@ -23,9 +18,4 @@ extern void CsrWifiNmeApConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg)
extern void CsrWifiNmeApStartCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
extern void CsrWifiNmeApStopCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_NME_H__ */
drivers/staging/csr/csr_wifi_nme_ap_serialize.h
View file @ 31370f7e
......@@ -17,10 +17,6 @@
#include "csr_wifi_nme_ap_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_NME_ENABLE
#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_serialize.h
#endif
......@@ -95,9 +91,4 @@ extern void* CsrWifiNmeApStationIndDes(u8 *buffer, size_t len);
extern size_t CsrWifiNmeApStationIndSizeof(void *msg);
#define CsrWifiNmeApStationIndSerFree CsrWifiNmeApPfree
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_NME_AP_SERIALIZE_H__ */
drivers/staging/csr/csr_wifi_nme_converter_init.h
View file @ 31370f7e
......@@ -13,10 +13,6 @@
#ifndef CSR_WIFI_NME_CONVERTER_INIT_H__
#define CSR_WIFI_NME_CONVERTER_INIT_H__
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_NME_ENABLE
#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_converter_init.h
#endif
......@@ -39,8 +35,4 @@ extern void CsrWifiNmeConverterInit(void);
#endif /* EXCLUDE_CSR_WIFI_NME_MODULE */
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_NME_CONVERTER_INIT_H__ */
drivers/staging/csr/csr_wifi_nme_lib.h
View file @ 31370f7e
......@@ -23,10 +23,6 @@
#include "csr_wifi_nme_task.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_NME_ENABLE
#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_lib.h
#endif
......@@ -1046,9 +1042,4 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
#define CsrWifiNmeWpsReqSend(src__, interfaceTag__, pin__, ssid__, bssid__) \
CsrWifiNmeWpsReqSendTo(CSR_WIFI_NME_IFACEQUEUE, src__, interfaceTag__, pin__, ssid__, bssid__)
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_NME_LIB_H__ */
drivers/staging/csr/csr_wifi_nme_prim.h
View file @ 31370f7e
......@@ -21,10 +21,6 @@
#include "csr_wifi_fsm_event.h"
#include "csr_wifi_sme_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_NME_ENABLE
#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_prim.h
#endif
......@@ -1657,10 +1653,5 @@ typedef struct
CsrResult status;
} CsrWifiNmeEventMaskSetCfm;
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_NME_PRIM_H__ */
drivers/staging/csr/csr_wifi_nme_serialize.h
View file @ 31370f7e
......@@ -16,10 +16,6 @@
#include "csr_wifi_msgconv.h"
#include "csr_wifi_nme_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_NME_ENABLE
#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_serialize.h
#endif
......@@ -166,9 +162,5 @@ extern size_t CsrWifiNmeSimUmtsAuthIndSizeof(void *msg);
#define CsrWifiNmeEventMaskSetCfmSizeof CsrWifiEventCsrUint16Sizeof
#define CsrWifiNmeEventMaskSetCfmSerFree CsrWifiNmePfree
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_NME_SERIALIZE_H__ */
drivers/staging/csr/csr_wifi_nme_task.h
View file @ 31370f7e
......@@ -16,10 +16,6 @@
#include <linux/types.h>
#include "csr_sched.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_NME_ENABLE
#error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_task.h
#endif
......@@ -30,9 +26,5 @@ void CsrWifiNmeInit(void **gash);
void CsrWifiNmeDeinit(void **gash);
void CsrWifiNmeHandler(void **gash);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_NME_TASK_H__ */
drivers/staging/csr/csr_wifi_private_common.h
View file @ 31370f7e
......@@ -11,10 +11,6 @@
#ifndef CSR_WIFI_PRIVATE_COMMON_H__
#define CSR_WIFI_PRIVATE_COMMON_H__
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief maximum number of STAs allowed to be connected
*
......@@ -81,9 +77,5 @@ typedef u8 CsrWifiInterfaceMode;
#define CSR_WIFI_MODE_WPS_ENROLLEE ((CsrWifiInterfaceMode) 0x06)
#define CSR_WIFI_MODE_IBSS ((CsrWifiInterfaceMode) 0x07)
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_wifi_result.h
View file @ 31370f7e
......@@ -13,10 +13,6 @@
#include "csr_result.h"
#ifdef __cplusplus
extern "C" {
#endif
/* THIS FILE SHOULD CONTAIN ONLY RESULT CODES */
/* Result Codes */
......@@ -27,9 +23,5 @@ extern "C" {
#define CSR_WIFI_HIP_RESULT_RANGE ((CsrResult) 5) /* Request exceeds the range of a file or a buffer */
#define CSR_WIFI_HIP_RESULT_NOT_FOUND ((CsrResult) 6) /* A file (typically a f/w patch) is not found */
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_RESULT_H__ */
drivers/staging/csr/csr_wifi_router_converter_init.h
View file @ 31370f7e
......@@ -13,10 +13,6 @@
#ifndef CSR_WIFI_ROUTER_CONVERTER_INIT_H__
#define CSR_WIFI_ROUTER_CONVERTER_INIT_H__
#ifdef __cplusplus
extern "C" {
#endif
#ifndef EXCLUDE_CSR_WIFI_ROUTER_MODULE
#include "csr_msgconv.h"
......@@ -35,8 +31,4 @@ extern void CsrWifiRouterConverterInit(void);
#endif /* EXCLUDE_CSR_WIFI_ROUTER_MODULE */
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_CONVERTER_INIT_H__ */
drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h
View file @ 31370f7e
......@@ -13,10 +13,6 @@
#ifndef CSR_WIFI_ROUTER_CTRL_CONVERTER_INIT_H__
#define CSR_WIFI_ROUTER_CTRL_CONVERTER_INIT_H__
#ifdef __cplusplus
extern "C" {
#endif
#ifndef EXCLUDE_CSR_WIFI_ROUTER_CTRL_MODULE
#include "csr_msgconv.h"
......@@ -35,8 +31,4 @@ extern void CsrWifiRouterCtrlConverterInit(void);
#endif /* EXCLUDE_CSR_WIFI_ROUTER_CTRL_MODULE */
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_CTRL_CONVERTER_INIT_H__ */
drivers/staging/csr/csr_wifi_router_ctrl_lib.h
View file @ 31370f7e
......@@ -22,11 +22,6 @@
#include "csr_wifi_router_ctrl_prim.h"
#include "csr_wifi_router_task.h"
#ifdef __cplusplus
extern "C" {
#endif
/*----------------------------------------------------------------------------*
* CsrWifiRouterCtrlFreeUpstreamMessageContents
*
......@@ -2084,9 +2079,4 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
#define CsrWifiRouterCtrlWifiOnCfmSend(dst__, clientData__, status__) \
CsrWifiRouterCtrlWifiOnCfmSendTo(dst__, CSR_WIFI_ROUTER_IFACEQUEUE, clientData__, status__)
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_CTRL_LIB_H__ */
drivers/staging/csr/csr_wifi_router_ctrl_prim.h
View file @ 31370f7e
......@@ -20,10 +20,6 @@
#include "csr_result.h"
#include "csr_wifi_fsm_event.h"
#ifdef __cplusplus
extern "C" {
#endif
#define CSR_WIFI_ROUTER_CTRL_PRIM (0x0401)
typedef CsrPrim CsrWifiRouterCtrlPrim;
......@@ -2113,10 +2109,5 @@ typedef struct
u8 *data;
} CsrWifiRouterCtrlWapiUnicastTxEncryptInd;
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_CTRL_PRIM_H__ */
drivers/staging/csr/csr_wifi_router_ctrl_sef.h
View file @ 31370f7e
......@@ -12,10 +12,6 @@
#include "csr_wifi_router_ctrl_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef void (*CsrWifiRouterCtrlStateHandlerType)(void* drvpriv, CsrWifiFsmEvent* msg);
extern const CsrWifiRouterCtrlStateHandlerType CsrWifiRouterCtrlDownstreamStateHandlers[CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT];
......@@ -51,8 +47,5 @@ extern "C" {
extern void CsrWifiRouterCtrlWapiUnicastTxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* msg);
extern void CsrWifiRouterCtrlWapiUnicastFilterReqHandler(void* drvpriv, CsrWifiFsmEvent* msg);
extern void CsrWifiRouterCtrlWapiFilterReqHandler(void* drvpriv, CsrWifiFsmEvent* msg);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_ROUTER_CTRL_H__ */
drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
View file @ 31370f7e
......@@ -17,10 +17,6 @@
#include "csr_wifi_router_ctrl_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void CsrWifiRouterCtrlPfree(void *ptr);
extern u8* CsrWifiRouterCtrlConfigurePowerModeReqSer(u8 *ptr, size_t *len, void *msg);
......@@ -333,9 +329,5 @@ extern void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, size_t len)
extern size_t CsrWifiRouterCtrlWapiUnicastTxEncryptIndSizeof(void *msg);
extern void CsrWifiRouterCtrlWapiUnicastTxEncryptIndSerFree(void *msg);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__ */
drivers/staging/csr/csr_wifi_router_lib.h
View file @ 31370f7e
......@@ -22,11 +22,6 @@
#include "csr_wifi_router_prim.h"
#include "csr_wifi_router_task.h"
#ifdef __cplusplus
extern "C" {
#endif
/*----------------------------------------------------------------------------*
* CsrWifiRouterFreeUpstreamMessageContents
*
......@@ -419,9 +414,4 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
#define CsrWifiRouterMaPacketUnsubscribeCfmSend(dst__, interfaceTag__, status__) \
CsrWifiRouterMaPacketUnsubscribeCfmSendTo(dst__, CSR_WIFI_ROUTER_IFACEQUEUE, interfaceTag__, status__)
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_LIB_H__ */
drivers/staging/csr/csr_wifi_router_prim.h
View file @ 31370f7e
......@@ -20,10 +20,6 @@
#include "csr_result.h"
#include "csr_wifi_fsm_event.h"
#ifdef __cplusplus
extern "C" {
#endif
#define CSR_WIFI_ROUTER_PRIM (0x0400)
typedef CsrPrim CsrWifiRouterPrim;
......@@ -421,10 +417,5 @@ typedef struct
u16 rate;
} CsrWifiRouterMaPacketInd;
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_PRIM_H__ */
drivers/staging/csr/csr_wifi_router_sef.h
View file @ 31370f7e
......@@ -12,10 +12,6 @@
#include "csr_wifi_router_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef void (*CsrWifiRouterStateHandlerType)(void* drvpriv, CsrWifiFsmEvent* msg);
extern const CsrWifiRouterStateHandlerType CsrWifiRouterDownstreamStateHandlers[CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT];
......@@ -26,8 +22,4 @@ extern "C" {
extern void CsrWifiRouterMaPacketResHandler(void* drvpriv, CsrWifiFsmEvent* msg);
extern void CsrWifiRouterMaPacketCancelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_ROUTER_H__ */
drivers/staging/csr/csr_wifi_router_serialize.h
View file @ 31370f7e
......@@ -16,10 +16,6 @@
#include "csr_wifi_msgconv.h"
#include "csr_wifi_router_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void CsrWifiRouterPfree(void *ptr);
extern u8* CsrWifiRouterMaPacketSubscribeReqSer(u8 *ptr, size_t *len, void *msg);
......@@ -67,9 +63,5 @@ extern void* CsrWifiRouterMaPacketIndDes(u8 *buffer, size_t len);
extern size_t CsrWifiRouterMaPacketIndSizeof(void *msg);
extern void CsrWifiRouterMaPacketIndSerFree(void *msg);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_SERIALIZE_H__ */
drivers/staging/csr/csr_wifi_router_task.h
View file @ 31370f7e
......@@ -15,19 +15,11 @@
#include "csr_sched.h"
#ifdef __cplusplus
extern "C" {
#endif
#define CSR_WIFI_ROUTER_LOG_ID 0x1201FFFF
extern CsrSchedQid CSR_WIFI_ROUTER_IFACEQUEUE;
void CsrWifiRouterInit(void **gash);
void CsrWifiRouterDeinit(void **gash);
void CsrWifiRouterHandler(void **gash);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_TASK_H__ */
drivers/staging/csr/csr_wifi_sme_ap_lib.h
View file @ 31370f7e
......@@ -22,11 +22,6 @@
#include "csr_wifi_sme_ap_prim.h"
#include "csr_wifi_sme_task.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_AP_ENABLE
#error CSR_WIFI_AP_ENABLE MUST be defined inorder to use csr_wifi_sme_ap_lib.h
#endif
......@@ -776,8 +771,4 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
CsrWifiSmeApWpsRegistrationStartedCfmSendTo(dst__, CSR_WIFI_SME_IFACEQUEUE, interfaceTag__, status__)
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_SME_AP_LIB_H__ */
drivers/staging/csr/csr_wifi_sme_ap_prim.h
View file @ 31370f7e
......@@ -20,10 +20,6 @@
#include "csr_wifi_fsm_event.h"
#include "csr_wifi_sme_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CSR_WIFI_AP_ENABLE
#error CSR_WIFI_AP_ENABLE MUST be defined inorder to use csr_wifi_sme_ap_prim.h
#endif
......@@ -1030,9 +1026,5 @@ typedef struct
} CsrWifiSmeApBaDeleteCfm;
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_SME_AP_PRIM_H__ */
drivers/staging/csr/csr_wifi_sme_converter_init.h
View file @ 31370f7e
......@@ -13,10 +13,6 @@
#ifndef CSR_WIFI_SME_CONVERTER_INIT_H__
#define CSR_WIFI_SME_CONVERTER_INIT_H__
#ifdef __cplusplus
extern "C" {
#endif
#ifndef EXCLUDE_CSR_WIFI_SME_MODULE
#include "csr_msgconv.h"
......@@ -35,8 +31,4 @@ extern void CsrWifiSmeConverterInit(void);
#endif /* EXCLUDE_CSR_WIFI_SME_MODULE */
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_SME_CONVERTER_INIT_H__ */
drivers/staging/csr/csr_wifi_sme_lib.h
View file @ 31370f7e
......@@ -32,11 +32,6 @@
# endif
#endif
#ifdef __cplusplus
extern "C" {
#endif
/*----------------------------------------------------------------------------*
* CsrWifiSmeFreeUpstreamMessageContents
*
......@@ -4305,9 +4300,4 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
#define CsrWifiSmeWpsConfigurationCfmSend(dst__, status__) \
CsrWifiSmeWpsConfigurationCfmSendTo(dst__, CSR_WIFI_SME_IFACEQUEUE, status__)
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_SME_LIB_H__ */
drivers/staging/csr/csr_wifi_sme_prim.h
View file @ 31370f7e
......@@ -20,10 +20,6 @@
#include "csr_result.h"
#include "csr_wifi_fsm_event.h"
#ifdef __cplusplus
extern "C" {
#endif
#define CSR_WIFI_SME_PRIM (0x0404)
typedef CsrPrim CsrWifiSmePrim;
......@@ -6510,10 +6506,5 @@ typedef struct
CsrResult status;
} CsrWifiSmeWpsConfigurationCfm;
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_SME_PRIM_H__ */
drivers/staging/csr/csr_wifi_sme_sef.h
View file @ 31370f7e
......@@ -12,11 +12,6 @@
#include "csr_wifi_sme_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef void (*CsrWifiSmeStateHandlerType)(void *drvpriv, CsrWifiFsmEvent *msg);
extern const CsrWifiSmeStateHandlerType
......@@ -144,8 +139,4 @@ extern void CsrWifiSmeCoreDumpIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
extern void CsrWifiSmeAmpStatusChangeIndHandler(void *drvpriv,
CsrWifiFsmEvent *msg);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_SME_H__ */
drivers/staging/csr/csr_wifi_sme_serialize.h
View file @ 31370f7e
......@@ -16,10 +16,6 @@
#include "csr_wifi_msgconv.h"
#include "csr_wifi_sme_prim.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void CsrWifiSmePfree(void *ptr);
#define CsrWifiSmeActivateReqSer CsrWifiEventSer
......@@ -666,9 +662,5 @@ extern void CsrWifiSmeCoreDumpIndSerFree(void *msg);
#define CsrWifiSmeWpsConfigurationCfmSizeof CsrWifiEventCsrUint16Sizeof
#define CsrWifiSmeWpsConfigurationCfmSerFree CsrWifiSmePfree
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_SME_SERIALIZE_H__ */
drivers/staging/csr/csr_wifi_sme_task.h
View file @ 31370f7e
......@@ -15,19 +15,11 @@
#include "csr_sched.h"
#ifdef __cplusplus
extern "C" {
#endif
#define CSR_WIFI_SME_LOG_ID 0x1202FFFF
extern CsrSchedQid CSR_WIFI_SME_IFACEQUEUE;
void CsrWifiSmeInit(void **gash);
void CsrWifiSmeDeinit(void **gash);
void CsrWifiSmeHandler(void **gash);
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_SME_TASK_H__ */
drivers/staging/csr/csr_wifi_vif_utils.h
View file @ 31370f7e
......@@ -11,10 +11,6 @@
#ifndef CSR_WIFI_VIF_UTILS_H
#define CSR_WIFI_VIF_UTILS_H
#ifdef __cplusplus
extern "C" {
#endif
/* STANDARD INCLUDES ********************************************************/
/* PROJECT INCLUDES *********************************************************/
......@@ -27,9 +23,5 @@ extern "C" {
#define CSR_WIFI_NUM_INTERFACES (u8)0x1
#define CSR_WIFI_INTERFACE_IN_USE (u16)0x0
#ifdef __cplusplus
}
#endif
#endif /* CSR_WIFI_VIF_UTILS_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7