Deleted Added
full compact
efx_check.h (299324) efx_check.h (299325)
1/*-
2 * Copyright (c) 2012-2015 Solarflare Communications Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright notice,

--- 13 unchanged lines hidden (view full) ---

22 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
23 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
24 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 * The views and conclusions contained in the software and documentation are
27 * those of the authors and should not be interpreted as representing official
28 * policies, either expressed or implied, of the FreeBSD Project.
29 *
1/*-
2 * Copyright (c) 2012-2015 Solarflare Communications Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright notice,

--- 13 unchanged lines hidden (view full) ---

22 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
23 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
24 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 * The views and conclusions contained in the software and documentation are
27 * those of the authors and should not be interpreted as representing official
28 * policies, either expressed or implied, of the FreeBSD Project.
29 *
30 * $FreeBSD: head/sys/dev/sfxge/common/efx_check.h 299324 2016-05-10 07:08:40Z arybchik $
30 * $FreeBSD: head/sys/dev/sfxge/common/efx_check.h 299325 2016-05-10 07:09:18Z arybchik $
31 */
32
33#ifndef _SYS_EFX_CHECK_H
34#define _SYS_EFX_CHECK_H
35
36#include "efsys.h"
37
38/*
39 * Check that the efsys.h header in client code has a valid combination of
40 * EFSYS_OPT_xxx options.
41 *
42 * NOTE: Keep checks for obsolete options here to ensure that they are removed
43 * from client code (and do not reappear in merges from other branches).
44 */
45
46#ifdef EFSYS_OPT_FALCON
47# error "FALCON is obsolete and is not supported."
48#else
49/* FIXME: remove this after Falcon support has been removed */
31 */
32
33#ifndef _SYS_EFX_CHECK_H
34#define _SYS_EFX_CHECK_H
35
36#include "efsys.h"
37
38/*
39 * Check that the efsys.h header in client code has a valid combination of
40 * EFSYS_OPT_xxx options.
41 *
42 * NOTE: Keep checks for obsolete options here to ensure that they are removed
43 * from client code (and do not reappear in merges from other branches).
44 */
45
46#ifdef EFSYS_OPT_FALCON
47# error "FALCON is obsolete and is not supported."
48#else
49/* FIXME: remove this after Falcon support has been removed */
50#define EFSYS_OPT_MON_MAX6647 (0)
51#define EFSYS_OPT_MON_NULL (0)
52
53#define EFSYS_OPT_NVRAM_FALCON_BOOTROM (0)
54#define EFSYS_OPT_NVRAM_SFT9001 (0)
55#define EFSYS_OPT_NVRAM_SFX7101 (0)
56
57#define EFSYS_OPT_PHY_NULL (0)
58#define EFSYS_OPT_PHY_QT2022C2 (0)

--- 103 unchanged lines hidden (view full) ---

162# error "MCDI_PROXY_AUTH requires MCDI"
163# endif
164#endif /* EFSYS_OPT_MCDI_PROXY_AUTH */
165
166#ifdef EFSYS_OPT_MON_LM87
167# error "MON_LM87 is obsolete and is not supported."
168#endif
169
50#define EFSYS_OPT_MON_NULL (0)
51
52#define EFSYS_OPT_NVRAM_FALCON_BOOTROM (0)
53#define EFSYS_OPT_NVRAM_SFT9001 (0)
54#define EFSYS_OPT_NVRAM_SFX7101 (0)
55
56#define EFSYS_OPT_PHY_NULL (0)
57#define EFSYS_OPT_PHY_QT2022C2 (0)

--- 103 unchanged lines hidden (view full) ---

161# error "MCDI_PROXY_AUTH requires MCDI"
162# endif
163#endif /* EFSYS_OPT_MCDI_PROXY_AUTH */
164
165#ifdef EFSYS_OPT_MON_LM87
166# error "MON_LM87 is obsolete and is not supported."
167#endif
168
170/* Support MAX6647 monitor */
171#if EFSYS_OPT_MON_MAX6647
172# if !EFSYS_OPT_FALCON
173# error "MON_MAX6647 requires FALCON"
174# endif
175#endif /* EFSYS_OPT_MON_MAX6647 */
169#ifdef EFSYS_OPT_MON_MAX6647
170# error "MON_MAX6647 is obsolete and is not supported."
171#endif
176
177/* Support null monitor */
178#if EFSYS_OPT_MON_NULL
179# if !EFSYS_OPT_FALCON
180# error "MON_NULL requires FALCON"
181# endif
182#endif /* EFSYS_OPT_MON_NULL */
183

--- 223 unchanged lines hidden ---
172
173/* Support null monitor */
174#if EFSYS_OPT_MON_NULL
175# if !EFSYS_OPT_FALCON
176# error "MON_NULL requires FALCON"
177# endif
178#endif /* EFSYS_OPT_MON_NULL */
179

--- 223 unchanged lines hidden ---