Skip to content

Fix linker errors and RELEASE.local for the test IOC #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marciodo merged 4 commits into from
Jul 17, 2024
Merged

Fix linker errors and RELEASE.local for the test IOC #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e42b26
fix linker errors
JJL772 Oct 17, 2023
08c8cfe
move away from pre-C99 GNU designated initializers
JJL772 Oct 18, 2023
c8d49ba
fix RELEASE.local for ipmiComm test IOC
JJL772 Oct 18, 2023
8890139
remove duplicate declaration w/different linkage
JJL772 Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions iocs/ipmicomm-test-IOC/configure/RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@
# Build variables that are NOT used in paths should be set in
# the CONFIG_SITE file.

# These lines allow developers to override these RELEASE settings
# without having to modify this file directly.
-include $(TOP)/../RELEASE.local
-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
-include $(TOP)/configure/RELEASE.local
-include $(TOP)/../../RELEASE_SITE

# modules this app depends upon. this builds a search path for libraries, header files, db files.
# ==========================================================
# Define the version strings for all needed modules
Expand All @@ -47,3 +40,10 @@ IPMICOMM=$(TOP)/../..
# Set EPICS_BASE last so it appears last in the DB, DBD, INCLUDE, and LIB search paths
# ====================================================================
EPICS_BASE=$(BASE_SITE_TOP)/$(BASE_MODULE_VERSION)

# These lines allow developers to override these RELEASE settings
# without having to modify this file directly.
-include $(TOP)/../RELEASE.local
-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
-include $(TOP)/configure/RELEASE.local
-include $(TOP)/../../RELEASE_SITE
4 changes: 4 additions & 0 deletions src/devMch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ extern uint32_t mchStat[MAX_MCH];
*/
uint8_t SENSOR_SCAN_PERIODS[5] = { 5, 10, 20, 30, 60 };

IOSCANPVT drvMchStatScan;
IOSCANPVT drvMchInitScan;
IOSCANPVT drvMchFruScan;

#define MAX_STRING_LENGTH 39
#define MAX_EGU_LENGTH 16

Expand Down
6 changes: 3 additions & 3 deletions src/devMch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ extern "C" {
#define MAX_NAME_LENGTH 50
#define MAX_TASK_LENGTH 10

IOSCANPVT drvMchStatScan;
IOSCANPVT drvMchInitScan;
IOSCANPVT drvMchFruScan;
extern IOSCANPVT drvMchStatScan;
extern IOSCANPVT drvMchInitScan;
extern IOSCANPVT drvMchFruScan;

/* Much of this stolen from devBusMapped */

Expand Down
3 changes: 3 additions & 0 deletions src/drvMch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ static int postIocStart = 0;
epicsMutexId mchStatMtx[MAX_MCH];
uint32_t mchStat[MAX_MCH] = { 0 };

IOSCANPVT drvSensorScan[MAX_MCH];
struct MchCbRec_ *MchCb;

static int mchSdrGetDataAll(MchData mchData);
static int mchFruGetDataAll(MchData mchData);
int mchGetFruIdFromIndex(MchData mchData, int index);
Expand Down
6 changes: 2 additions & 4 deletions src/drvMch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
#define MAX_MCH 255
#define MAX_SENS_INST 32 /* Max instances of one sensor type on one FRU or Management Controller entity */

extern const void *mchCbRegistryId;

extern uint32_t mchStat[MAX_MCH];

/* Sensor scan period [seconds] */
Expand All @@ -30,7 +28,7 @@ extern volatile uint8_t mchSensorScanPeriod;
extern epicsMutexId mchStatMtx[MAX_MCH];

/* Used for sensor scanning; one list per MCH */
IOSCANPVT drvSensorScan[MAX_MCH];
extern IOSCANPVT drvSensorScan[MAX_MCH];

/* Vadatech typically sends 2 replies; NAT sends 1 */
#define RPLY_TIMEOUT_SENDMSG_RPLY 0.50
Expand Down Expand Up @@ -254,7 +252,7 @@ extern char mchDescString[MCH_TYPE_MAX][MCH_DESC_MAX_LENGTH]; /* Defined in drvM
#define VT_ENTITY_ID_RTM 0xC0 /* asked Vivek to verify */

extern const void *mchCbRegistryId;
struct MchCbRec_ {
extern struct MchCbRec_ {
void (*assign_sys_sizes) (MchData mchData);
void (*assign_site_info) (MchData mchData);
void (*assign_fru_lkup) (MchData mchData);
Expand Down
26 changes: 12 additions & 14 deletions src/drvMchServerPc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,21 @@ Fru fru;
}

MchCbRec drvMchSupermicroCb = {
assign_sys_sizes: assign_sys_sizes_supermicro,
assign_site_info: 0,
assign_fru_lkup: assign_fru_lkup_supermicro,
fru_data_suppl: 0,
sensor_get_fru: sensor_get_fru_supermicro,
get_chassis_status: mchMsgGetChassisStatus

.assign_sys_sizes = assign_sys_sizes_supermicro,
.assign_site_info = 0,
.assign_fru_lkup = assign_fru_lkup_supermicro,
.fru_data_suppl = 0,
.sensor_get_fru = sensor_get_fru_supermicro,
.get_chassis_status = mchMsgGetChassisStatus
};

MchCbRec drvMchAdvantechCb = {
assign_sys_sizes: 0,
assign_site_info: 0,
assign_fru_lkup: assign_fru_lkup_advantech,
fru_data_suppl: 0,
sensor_get_fru: sensor_get_fru_advantech,
get_chassis_status: mchMsgGetChassisStatus

.assign_sys_sizes = 0,
.assign_site_info = 0,
.assign_fru_lkup = assign_fru_lkup_advantech,
.fru_data_suppl = 0,
.sensor_get_fru = sensor_get_fru_advantech,
.get_chassis_status = mchMsgGetChassisStatus
};

static void
Expand Down