Skip to content
This repository has been archived by the owner on Sep 29, 2020. It is now read-only.

Commit

Permalink
update SLAC 4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jeonghanlee committed Jul 19, 2018
1 parent 5fd63c0 commit 1a88ba1
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 37 deletions.
5 changes: 4 additions & 1 deletion RELEASE_NOTES
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
R4.1.0: 15-Nov-2017 Marcio P. Donadio
- Modified to build for git workflow and EPICS 3.15.

ipmiComm-R4-0-2: 10-Aug-2017 S. Hoobler
Fix handling of session sequence numbers when they are greater than expected.
(Should fix problem of not successfully re-connecting to ATCA crates.)
Expand Down Expand Up @@ -112,4 +115,4 @@ ipmiComm-R1-1-0: Add support for fan level readback, control, and to read fan p

ipmiComm-R1-0-0: Initial release. Built against EPICS base-R3-14-12



48 changes: 14 additions & 34 deletions configure/RELEASE
Original file line number Diff line number Diff line change
@@ -1,37 +1,17 @@
#RELEASE Location of external products
# RELEASE
# Defines location of external products
# Run "gnumake clean uninstall install" in the application
# top directory each time this file is changed.
include $(TOP)/RELEASE_SITE

# =============================================================
# Define location of module tree with respect to
# EPICS_SITE_TOP
# =============================================================
EPICS_MODULES=$(MODULES_SITE_TOP)

# =============================================================
# Define epics version
# =============================================================
BASE_MODULE_VERSION=$(EPICS_BASE_VER)

# =============================================================
# Define the version of modules needed by
# IOC apps or other Support apps
# =============================================================
ASYN_MODULE_VERSION=asyn-R4-21_1-0
IOCADMIN_MODULE_VERSION=iocAdmin-R3-1-12_1-1
# ============================================================
# Support module locations
# ============================================================
ASYN=$(EPICS_MODULES)/asyn/$(ASYN_MODULE_VERSION)
IOCADMIN=$(EPICS_MODULES)/iocAdmin/$(IOCADMIN_MODULE_VERSION)

# =================================================================
# Define EPICS_BASE
# EPICS_BASE usually appears last so other apps can override stuff:
# =================================================================
EPICS_BASE=$(BASE_SITE_TOP)/$(BASE_MODULE_VERSION)



-include $(TOP)/configure/RELEASE.local

# Check for valid macro definitions for module release directories
# You can add tests here to make sure RELEASE.local defined valid
# macros for all the module dependencies
#ifeq ($(wildcard $(EPICS_BASE)/include),)
#$(error Invalid EPICS_BASE: $(EPICS_BASE))
#endif
#ifeq ($(wildcard $(ASYN)/include),)
#$(error Invalid ASYN: $(ASYN))
#endif
#...

40 changes: 40 additions & 0 deletions configure/RELEASE.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# RELEASE.local
#
# Read definitions of:
# EPICS_SITE_TOP
# BASE_MODULE_VERSION
# EPICS_MODULES
# from one of the following options
-include $(TOP)/../../RELEASE_SITE
-include $(TOP)/RELEASE_SITE

# Check that EPICS_MODULES was defined in a RELEASE_SITE file
-include $(TOP)/../../RELEASE_SITE.check

# ==========================================================
# Define the version strings for all needed modules
# Use naming pattern:
# FOO_MODULE_VERSION = R1.2
# so scripts can extract version strings
# Don't set your version to anything such as "test" that
# could match a directory name.
# ==========================================================
ASYN_MODULE_VERSION=R4.31-1.0.0
IOCADMIN_MODULE_VERSION=R3.1.15-1.0.0

# ==========================================================
# Define module paths using pattern
# FOO = $(EPICS_MODULES)/foo/$(FOO_MODULE_VERSION)
# or
# FOO = /Full/Path/To/Development/Version
# ==========================================================
ASYN=$(EPICS_MODULES)/asyn/$(ASYN_MODULE_VERSION)
IOCADMIN=$(EPICS_MODULES)/iocAdmin/$(IOCADMIN_MODULE_VERSION)


# Set EPICS_BASE last so it appears last in the DB, DBD, INCLUDE, and LIB search paths
EPICS_BASE = $(EPICS_SITE_TOP)/base/$(BASE_MODULE_VERSION)

# Check for undefined EPICS_BASE
-include $(TOP)/../../EPICS_BASE.check

4 changes: 2 additions & 2 deletions src/ipmiDef.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ uint8_t IPMI_WRAPPER[] = { IPMI_MSG_AUTH_TYPE_NONE,/* Auth type none */
uint8_t IPMI_WRAPPER_PWD_KEY[] = { IPMI_MSG_AUTH_TYPE_PWD_KEY, /* Auth type */
0, 0, 0, 0, /* 4-byte Session sequence number */
0, 0, 0, 0, /* 4-byte Session ID */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* Message Authentication Code (password) */
'I', 'p', 'm', 'i', '2', 'A', 'd', 'm', 'i', 'n', 0, 0, 0, 0, 0, 0, /* Message Authentication Code (password) */
0 }; /* Number of bytes in message */

/* IPMI message part 1 */
Expand Down Expand Up @@ -69,7 +69,7 @@ uint8_t GET_SESS_MSG_PWD_KEY[] = { IPMI_MSG_ADDR_SW, /* Requester's addre
0, /* Message sequence number */
IPMI_MSG_CMD_GET_SESSION_CHALLENGE, /* Command code */
IPMI_MSG_AUTH_TYPE_PWD_KEY, /* Authentication type */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* User name */
'c', 'o', 'n', 't', 'r', 'o', 'l', 's', 0, 0, 0, 0, 0, 0, 0, 0, /* User name */
0 }; /* For checksum */

/* Activate Session */
Expand Down

0 comments on commit 1a88ba1

Please sign in to comment.