Import fixes from 1.0 repository.

packages/base/any/onlp/src/onlp/module/auto/onlp.yml

@@ -83,16 +83,18 @@ cdefs: &cdefs
     default: 64
 - ONLP_CONFIG_INCLUDE_THERMAL_THRESHOLDS:
     doc: "Include thermal threshold reporting."
-    default: 1
+    default: 0
 
 # Error codes
 onlp_status: &onlp_status
 - OK : 0
-- E_UNSUPPORTED : -1
-- E_MISSING : -2
-- E_INVALID : -3
-- E_INTERNAL : -4
-- E_PARAM : -5
+- E_GENERIC     : -1
+- E_UNSUPPORTED : -10
+- E_MISSING     : -11
+- E_INVALID     : -12
+- E_INTERNAL    : -13
+- E_PARAM       : -14
+- E_I2C         : -15
 
 # OID Types
 oid_types: &oid_types

packages/base/any/onlp/src/onlp/module/inc/onlp/onlp.h

@@ -31,11 +31,13 @@
 /** onlp_status */
 typedef enum onlp_status_e {
     ONLP_STATUS_OK = 0,
-    ONLP_STATUS_E_UNSUPPORTED = -1,
-    ONLP_STATUS_E_MISSING = -2,
-    ONLP_STATUS_E_INVALID = -3,
-    ONLP_STATUS_E_INTERNAL = -4,
-    ONLP_STATUS_E_PARAM = -5,
+    ONLP_STATUS_E_GENERIC = -1,
+    ONLP_STATUS_E_UNSUPPORTED = -10,
+    ONLP_STATUS_E_MISSING = -11,
+    ONLP_STATUS_E_INVALID = -12,
+    ONLP_STATUS_E_INTERNAL = -13,
+    ONLP_STATUS_E_PARAM = -14,
+    ONLP_STATUS_E_I2C = -15,
 } onlp_status_t;
 /* <auto.end.enum(tag:onlp).define> */
 

packages/base/any/onlp/src/onlp/module/inc/onlp/onlp_config.h

@@ -241,7 +241,7 @@
 
 
 #ifndef ONLP_CONFIG_INCLUDE_THERMAL_THRESHOLDS
-#define ONLP_CONFIG_INCLUDE_THERMAL_THRESHOLDS 1
+#define ONLP_CONFIG_INCLUDE_THERMAL_THRESHOLDS 0
 #endif
 
 

packages/base/any/onlp/src/onlp/module/src/onlp_enums.c

@@ -864,22 +864,26 @@ onlp_sfp_control_flag_valid(onlp_sfp_control_flag_t e)
 aim_map_si_t onlp_status_map[] =
 {
     { "OK", ONLP_STATUS_OK },
+    { "E_GENERIC", ONLP_STATUS_E_GENERIC },
     { "E_UNSUPPORTED", ONLP_STATUS_E_UNSUPPORTED },
     { "E_MISSING", ONLP_STATUS_E_MISSING },
     { "E_INVALID", ONLP_STATUS_E_INVALID },
     { "E_INTERNAL", ONLP_STATUS_E_INTERNAL },
     { "E_PARAM", ONLP_STATUS_E_PARAM },
+    { "E_I2C", ONLP_STATUS_E_I2C },
     { NULL, 0 }
 };
 
 aim_map_si_t onlp_status_desc_map[] =
 {
     { "None", ONLP_STATUS_OK },
+    { "None", ONLP_STATUS_E_GENERIC },
     { "None", ONLP_STATUS_E_UNSUPPORTED },
     { "None", ONLP_STATUS_E_MISSING },
     { "None", ONLP_STATUS_E_INVALID },
     { "None", ONLP_STATUS_E_INTERNAL },
     { "None", ONLP_STATUS_E_PARAM },
+    { "None", ONLP_STATUS_E_I2C },
     { NULL, 0 }
 };
 

packages/base/any/onlp/src/onlplib/module/src/i2c.c

@@ -55,16 +55,16 @@ onlp_i2c_open(int bus, uint8_t addr, uint32_t flags)
 
     /* Set 10 or 7 bit mode */
     rv = ioctl(fd, I2C_TENBIT, (flags & ONLP_I2C_F_TENBIT) ? 1 : 0);
-    if(rv != 0) {
-        AIM_LOG_ERROR("i2c-%d: failed to set %d bit mode",
+    if(rv == -1) {
+        AIM_LOG_ERROR("i2c-%d: failed to set %d bit mode", bus,
                       (flags & ONLP_I2C_F_TENBIT) ? 10 : 7);
         goto error;
     }
 
     /* Enable/Disable PEC */
     rv = ioctl(fd, I2C_PEC, (flags & ONLP_I2C_F_PEC) ? 1 : 0);
-    if(rv != 0) {
-        AIM_LOG_ERROR("i2c-%d: failed to set PEC mode %d",
+    if(rv == -1) {
+        AIM_LOG_ERROR("i2c-%d: failed to set PEC mode %d", bus,
                       (flags & ONLP_I2C_F_PEC) ? 1 : 0);
         goto error;
     }
@@ -74,10 +74,11 @@ onlp_i2c_open(int bus, uint8_t addr, uint32_t flags)
                (flags & ONLP_I2C_F_FORCE) ? I2C_SLAVE_FORCE : I2C_SLAVE,
                addr);
 
-    if(rv != 0) {
+    if(rv == -1) {
         AIM_LOG_ERROR("i2c-%d: %s slave address 0x%x failed: %{errno}",
                       bus,
                       (flags & ONLP_I2C_F_FORCE) ? "forcing" : "setting",
+                      addr,
                       errno);
         goto error;
     }
@@ -86,7 +87,7 @@ onlp_i2c_open(int bus, uint8_t addr, uint32_t flags)
 
  error:
     close(fd);
-    return -1;
+    return ONLP_STATUS_E_I2C;
 }
 
 int
@@ -125,7 +126,7 @@ onlp_i2c_block_read(int bus, uint8_t addr, uint8_t offset, int size,
 
  error:
     close(fd);
-    return -1;
+    return ONLP_STATUS_E_I2C;
 }
 
 int
@@ -157,7 +158,7 @@ onlp_i2c_read(int bus, uint8_t addr, uint8_t offset, int size,
 
  error:
     close(fd);
-    return -1;
+    return ONLP_STATUS_E_I2C;
 }
 
 
@@ -187,7 +188,7 @@ onlp_i2c_write(int bus, uint8_t addr, uint8_t offset, int size,
 
  error:
     close(fd);
-    return -1;
+    return ONLP_STATUS_E_I2C;
 }
 
 int

packages/base/any/onlp/src/sff/module/src/sff_db.c

@@ -1432,7 +1432,7 @@ sff_db_get_type(sff_eeprom_t* se, sff_module_type_t type)
     sff_db_entry_t* entry;
     for(i = 0; i < AIM_ARRAYSIZE(sff_database__); i++) {
         entry = sff_database__ + i;
-        if(se->info.module_type == type) {
+        if(entry->se.info.module_type == type) {
             memcpy(se, &entry->se, sizeof(*se));
             return 1;
         }