From b2564128f899e82239649fba3bf25a5840a25287 Mon Sep 17 00:00:00 2001
From: Rohit Malaga <rohit.malaga@bigswitch.com>
Date: Tue, 23 Feb 2016 14:50:28 -0800
Subject: [PATCH] cleaning code

---
 .../src/module/inc/oom-shim/oom-shim.h        |  2 +-
 .../src/module/inc/oom-shim/oom_internal.h    |  6 +++
 .../oom-shim/src/module/src/oom_internal.c    | 28 ++++++++++++++
 .../any/oom-shim/src/module/src/oom_shim.c    | 38 +++++++++++++++----
 4 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 packages/base/any/oom-shim/src/module/inc/oom-shim/oom_internal.h
 create mode 100644 packages/base/any/oom-shim/src/module/src/oom_internal.c

diff --git a/packages/base/any/oom-shim/src/module/inc/oom-shim/oom-shim.h b/packages/base/any/oom-shim/src/module/inc/oom-shim/oom-shim.h
index 0925b787..f83e8035 100644
--- a/packages/base/any/oom-shim/src/module/inc/oom-shim/oom-shim.h
+++ b/packages/base/any/oom-shim/src/module/inc/oom-shim/oom-shim.h
@@ -1 +1 @@
-#define MAXPORTS 6
+#define MAXPORTS 512
diff --git a/packages/base/any/oom-shim/src/module/inc/oom-shim/oom_internal.h b/packages/base/any/oom-shim/src/module/inc/oom-shim/oom_internal.h
new file mode 100644
index 00000000..67bb0618
--- /dev/null
+++ b/packages/base/any/oom-shim/src/module/inc/oom-shim/oom_internal.h
@@ -0,0 +1,6 @@
+#ifndef OOM_INTERNAL_H_
+#define OOM_INTERNAL_H_
+
+extern void print_block_hex(uint8_t* buf);
+
+#endif
diff --git a/packages/base/any/oom-shim/src/module/src/oom_internal.c b/packages/base/any/oom-shim/src/module/src/oom_internal.c
new file mode 100644
index 00000000..0059479d
--- /dev/null
+++ b/packages/base/any/oom-shim/src/module/src/oom_internal.c
@@ -0,0 +1,28 @@
+/*
+ * Internal OOM functions
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+void print_block_hex(uint8_t* buf)
+{
+	int j, k;
+	uint8_t* bufptr8;
+	uint32_t tempintchar;
+
+	bufptr8 = buf;
+	for (j = 0; j < 8; j++) {
+		printf("       " );
+		for (k = 0; k < 19; k++) {
+			if ((k % 5) == 4) {
+				printf(" ");
+			} else {
+				tempintchar = *bufptr8;
+				printf("%.2X", tempintchar);
+				bufptr8++;
+			}
+		}
+		printf("\n");
+	}
+}
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 535a8a85..14c1275b 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
@@ -30,6 +30,7 @@
 #include <sff/sff.h>
 #include <oom-shim/oom-shim.h>
 #include <oom-shim/oom_south.h>
+#include <oom-shim/oom_internal.h>
 
 int Initialized = 0;
 
@@ -68,7 +69,7 @@ int oom_get_portlist(oom_port_t portlist[], int listsize){
         
         pptr = &portlist[i];
         pptr->handle = (void *)(uintptr_t)port;
-        pptr->oom_class = OOM_PORT_CLASS_SFF;
+        pptr->oom_class = OOM_PORT_CLASS_UNKNOWN;
         sprintf(pptr->name, "port%d", port);
         i++;
         
@@ -79,24 +80,47 @@ int oom_get_portlist(oom_port_t portlist[], int listsize){
         }
 
         if(rv < 0){
-            printf("%4d  Error\n", port);
+            aim_printf(&aim_pvs_stdout, "%4d  Error %{onlp_status}\n", port, rv);
             continue;
         }
 
         rv = onlp_sfp_eeprom_read(port, &data);
 
         if(rv < 0){
-            printf("%4d  Error}\n", port);
+            aim_printf(&aim_pvs_stdout, "%4d  Error %{onlp_status}\n", port, rv);
             continue;
         }
      
         sff_info_t sff;
         sff_info_init(&sff, data);
-        if(!sff.supported) {
-            printf("%13d  UNK\n", port);
-            continue;
+      
+        if(sff.supported) {
+            pptr->oom_class = OOM_PORT_CLASS_SFF; 
         }
-        printf("The sfp_type is : %-14s",sff.sfp_type_name);
     }
     return 0;
 }
+
+int oom_get_function(oom_port_t* port, oom_functions_t function, int* rv){
+ return -1;   
+}
+
+int oom_get_memory_sff(oom_port_t* port, int address, int page, int offset, int len, uint8_t* data){
+    int rv;
+    unsigned int port_num; 
+    uint8_t* idprom = NULL;
+
+    port_num = (unsigned int)(uintptr_t)port->handle;
+    rv = onlp_sfp_eeprom_read(port_num, &idprom);
+    if(rv < 0) {
+        aim_printf(&aim_pvs_stdout, "Error reading eeprom: %{onlp_status}\n");
+    }
+    else {
+        aim_printf(&aim_pvs_stdout, "eeprom:\n%{data}\n", idprom, 128);
+        aim_free(idprom);
+    }
+    return 0;
+}
+int oom_get_memory_cfp(oom_port_t* port, int address, int len, uint16_t* data){
+    return -1;
+}