diff --git a/sis8300bcmApp/Db/sis8300bcm-fiber.template b/sis8300bcmApp/Db/sis8300bcm-fiber.template index 0211cb939c6c12793bba4afd360ab5a7881a3537..c352ffceed60f3f2e7c081f2a7f5487d013fa123 100644 --- a/sis8300bcmApp/Db/sis8300bcm-fiber.template +++ b/sis8300bcmApp/Db/sis8300bcm-fiber.template @@ -125,3 +125,12 @@ record(bi, "$(P)$(R)SoftwareErrorR") field(SCAN, "I/O Intr") } +record(bo, "$(P)$(R)Reset") +{ + field(DTYP, "asynInt32") + field(OUT, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))BCM.FIBER.RESET") + field(ZNAM, "No") + field(ONAM, "Yes") + field(HIGH, "1") +# field(ASG, "critical") +} diff --git a/sis8300bcmApp/src/sis8300bcm.cpp b/sis8300bcmApp/src/sis8300bcm.cpp index 7c791fb7413e3734c3237ed1ac151a31a889f497..3ee42ce92712593f529f488d6144a0391c99b448 100644 --- a/sis8300bcmApp/src/sis8300bcm.cpp +++ b/sis8300bcmApp/src/sis8300bcm.cpp @@ -323,6 +323,7 @@ sis8300bcm::sis8300bcm(const char *portName, const char *devicePath, createParam(BCMFiberChannelUpString, asynParamInt32, &BCMFiberChannelUp); createParam(BCMFiberHardwareErrorString, asynParamInt32, &BCMFiberHardwareError); createParam(BCMFiberSoftwareErrorString, asynParamInt32, &BCMFiberSoftwareError); + createParam(BCMFiberResetString, asynParamInt32, &BCMFiberReset); // LUT, channel specific char buf[255]; for (int i = 0; i < BCM_LUT_SIZE; i++) { @@ -1931,12 +1932,17 @@ asynStatus sis8300bcm::writeInt32(asynUser *pasynUser, epicsInt32 value) if (ret) { asynPrintError(pasynUserSelf, "sis8300drvbcm_set_fiber_out_data_enable returned %d", ret); } + + } else if (function == BCMFiberReset) { + ret = sis8300drvbcm_set_fiber_reset(mDeviceHandle, addr, value); + if (ret) { + asynPrintError(pasynUserSelf, "sis8300drvbcm_set_fiber_reset returned %d", ret); + } } else { if (function < BCM_FIRST_PARAM) { status = sis8300::writeInt32(pasynUser, value); } } - if (ret) { status = asynError; snprintf(mMessageBuffer, MAX_MESSAGE_LENGTH, "[%s,%d,%s] set failed: value %d", portName, addr, name, value); diff --git a/sis8300bcmApp/src/sis8300bcm.h b/sis8300bcmApp/src/sis8300bcm.h index b23167bc6df8dce5b775c7b63ccf1bf79cf1e4f6..aa1a71009c01812a7516a0a73a50e861a7c2a612 100644 --- a/sis8300bcmApp/src/sis8300bcm.h +++ b/sis8300bcmApp/src/sis8300bcm.h @@ -219,6 +219,7 @@ #define BCMFiberChannelUpString "BCM.FIBER.CHANNEL_UP" #define BCMFiberHardwareErrorString "BCM.FIBER.HARDWARE_ERROR" #define BCMFiberSoftwareErrorString "BCM.FIBER.SOFTWARE_ERROR" +#define BCMFiberResetString "BCM.FIBER.RESET" // LUT, board specific, 16 locations #define BCMLutDestinationIDString "BCM.LUT%d.DEST_ID" #define BCMLutMinTriggerPeriodString "BCM.LUT%d.MIN_TRIGGER_PERIOD" @@ -438,6 +439,7 @@ protected: int BCMFiberChannelUp; int BCMFiberHardwareError; int BCMFiberSoftwareError; + int BCMFiberReset; // LUT, board specific int BCMLutDestinationID[BCM_LUT_SIZE]; int BCMLutMinTriggerPeriod[BCM_LUT_SIZE]; diff --git a/vendor/ess/lib/sis8300bcm_reg.h b/vendor/ess/lib/sis8300bcm_reg.h index 6057addcb6aa0b96ddfbf2eeb3e3066588997ec0..62a96e43e3256d5a156f318f2ba1a6407dcafc8b 100644 --- a/vendor/ess/lib/sis8300bcm_reg.h +++ b/vendor/ess/lib/sis8300bcm_reg.h @@ -189,6 +189,7 @@ extern "C" { */ #define SIS8300BCM_FIBR_X_OUT_DATA_SELECT_OFF 0x000 #define SIS8300BCM_FIBR_X_STATUS_OFF 0x001 +#define SIS8300BCM_FIBR_X_RESET_OFF 0x002 #ifdef __cplusplus } diff --git a/vendor/ess/lib/sis8300drvbcm.c b/vendor/ess/lib/sis8300drvbcm.c index e455edddc0c09d9b81515937f34775b94bb89bed..70581cbb98e8bc3c7e0c17a7d9c8cefd7772629d 100644 --- a/vendor/ess/lib/sis8300drvbcm.c +++ b/vendor/ess/lib/sis8300drvbcm.c @@ -2958,3 +2958,13 @@ int sis8300drvbcm_get_fiber_software_error(sis8300drv_usr *sisuser, unsigned int return ret; } +int sis8300drvbcm_set_fiber_reset(sis8300drv_usr *sisuser, unsigned int channel, unsigned int reset) +{ + unsigned int reg = SIS8300BCM_CHANNEL_BLOCK_BASE + \ + (SIS8300BCM_CHANNEL_BLOCK_SIZE * channel) + \ + SIS8300BCM_FIBR_BANK_OFF + \ + SIS8300BCM_FIBR_X_RESET_OFF; + int ret = sis8300drv_reg_write(sisuser, reg, reset); + return ret; +} + diff --git a/vendor/ess/lib/sis8300drvbcm.h b/vendor/ess/lib/sis8300drvbcm.h index 98dd3e2099c3b0079610cf4e420329645b80473c..ba82e427cb86dab53d4e978b478db5d9b38aaefb 100644 --- a/vendor/ess/lib/sis8300drvbcm.h +++ b/vendor/ess/lib/sis8300drvbcm.h @@ -301,6 +301,7 @@ int sis8300drvbcm_get_fiber_lane_up(sis8300drv_usr *sisuser, unsigned int channe int sis8300drvbcm_get_fiber_channel_up(sis8300drv_usr *sisuser, unsigned int channel, unsigned int *channel_up); int sis8300drvbcm_get_fiber_hardware_error(sis8300drv_usr *sisuser, unsigned int channel, unsigned int *hardware_error); int sis8300drvbcm_get_fiber_software_error(sis8300drv_usr *sisuser, unsigned int channel, unsigned int *software_error); +int sis8300drvbcm_set_fiber_reset(sis8300drv_usr *sisuser, unsigned int channel, unsigned int reset); #ifdef __cplusplus }