From fe94151850c30046351d65cf365b2a654a5de729 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Wed, 8 Aug 2018 01:17:51 +0000 Subject: [PATCH] Additional build and ONLPv2 fixes. --- packages/base/any/oom-shim/builds/Makefile | 2 +- packages/base/any/oom-shim/src/module/src/oom_shim.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/base/any/oom-shim/builds/Makefile b/packages/base/any/oom-shim/builds/Makefile index 18e9b20f..bc260d88 100644 --- a/packages/base/any/oom-shim/builds/Makefile +++ b/packages/base/any/oom-shim/builds/Makefile @@ -27,7 +27,7 @@ include $(ONL)/make/any.mk MODULE := oom_shim include $(BUILDER)/standardinit.mk -DEPENDMODULES := AIM onlplib oom_shim cjson cjson_util IOF timer_wheel OS uCli +DEPENDMODULES := AIM onlplib oom_shim cjson cjson_util IOF timer_wheel OS uCli ELS DEPENDMODULE_HEADERS := onlp sff LIBONLP := $(shell $(ONLPM) --find-file onlp:$(ARCH) libonlp.so) diff --git a/packages/base/any/oom-shim/src/module/src/oom_shim.c b/packages/base/any/oom-shim/src/module/src/oom_shim.c index 86e9f2c5..4032f1bf 100644 --- a/packages/base/any/oom-shim/src/module/src/oom_shim.c +++ b/packages/base/any/oom-shim/src/module/src/oom_shim.c @@ -101,9 +101,9 @@ int oom_get_memory_sff(oom_port_t* port, int address, int page, int offset, int **/ if (address == 0xa0) { - rv = onlp_sfp_dev_read_block(port_num, 0x50, 0, 256, &idprom); + rv = onlp_sfp_dev_alloc_read(port_num, 0x50, 0, 256, &idprom); } else if (address == 0xa2) { - rv = onlp_sfp_dev_read_block(port_num, 0x51, 0, 256, &idprom); + rv = onlp_sfp_dev_alloc_read(port_num, 0x51, 0, 256, &idprom); } else { aim_printf(&aim_pvs_stdout, "Error invalid address: 0x%02x\n", address); return -EINVAL;