More v2 fixups.

packages/platforms/accton/x86-64/as5812-54x/onlp/builds/Makefile

@@ -1,2 +1 @@
-FILTER=src
-include $(ONL)/make/subdirs.mk
+include $(ONL)/packages/base/any/onlp/builds/platform/build.mk

packages/platforms/accton/x86-64/as5812-54x/onlp/builds/x86_64_accton_as5812_54x/module/src/fani.c

@@ -141,6 +141,12 @@ static onlp_fan_info_t finfo[] = {
     } while(0)
 
 
+int
+onlp_fani_id_validate(onlp_oid_id_t id)
+{
+    return ONLP_OID_ID_VALIDATE_RANGE(id, 1, AIM_ARRAYSIZE(finfo) - 1);
+}
+
 static int
 _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
 {
@@ -264,7 +270,7 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
 
 
 int
-onlp_fani_info_get(onlp_oid_t id, onlp_fan_info_t* info)
+onlp_fani_info_get(onlp_oid_id_t id, onlp_fan_info_t* info)
 {
     int rc = 0;
 

packages/platforms/accton/x86-64/as5812-54x/onlp/builds/x86_64_accton_as5812_54x/module/src/ledi.c

@@ -33,13 +33,6 @@
 
 //#include "onlpie_int.h"
 
-#define VALIDATE(_id)                           \
-    do {                                        \
-        if(!ONLP_OID_IS_LED(_id)) {             \
-            return ONLP_STATUS_E_INVALID;       \
-        }                                       \
-    } while(0)
-
 /* LED related data
  */
 enum led_light_mode { /*must be the same with the definition @ kernel driver */
@@ -150,11 +143,8 @@ static int conver_led_light_mode_to_driver(int led_ligth_mode)
     return 0;
 }
 
-/*
- * This function will be called prior to any other onlp_ledi_* functions.
- */
 int
-onlp_ledi_init(void)
+onlp_ledi_hw_init(uint32_t flags)
 {
     /*
      * Turn off the LOCATION and DIAG LEDs at startup
@@ -165,25 +155,27 @@ onlp_ledi_init(void)
 }
 
 int
-onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
+onlp_ledi_id_validate(onlp_oid_id_t id)
+{
+    return ONLP_OID_ID_VALIDATE_RANGE(id, 1, AIM_ARRAYSIZE(linfo) -1 );
+}
+
+int
+onlp_ledi_info_get(onlp_oid_id_t id, onlp_led_info_t* info)
 {
 
-    int  fd, len, nbytes=1, local_id;
-	char data[2] = {0};
+    int  fd, len, nbytes=1;
+    char data[2] = {0};
     char fullpath[50] = {0};
 
-    VALIDATE(id);
-
-    local_id = ONLP_OID_ID_GET(id);
-
     /* get fullpath */
-    if (strchr(last_path[local_id], '/') != NULL)
+    if (strchr(last_path[id], '/') != NULL)
 	{
-        sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
+        sprintf(fullpath, "%s%s", prefix_path, last_path[id]);
 	}
 	else
 	{
-        sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
+        sprintf(fullpath, "%s%s/%s", prefix_path, last_path[id], filename);
     }
 
 	/* Set the onlp_oid_hdr_t and capabilities */
@@ -212,27 +204,6 @@ onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
     return ONLP_STATUS_OK;
 }
 
-/*
- * Turn an LED on or off.
- *
- * This function will only be called if the LED OID supports the ONOFF
- * capability.
- *
- * What 'on' means in terms of colors or modes for multimode LEDs is
- * up to the platform to decide. This is intended as baseline toggle mechanism.
- */
-int
-onlp_ledi_set(onlp_oid_t id, int on_or_off)
-{
-    VALIDATE(id);
-
-    if (!on_or_off) {
-        return onlp_ledi_mode_set(id, ONLP_LED_MODE_OFF);
-    }
-
-    return ONLP_STATUS_E_UNSUPPORTED;
-}
-
 /*
  * This function puts the LED into the given mode. It is a more functional
  * interface for multimode LEDs.
@@ -240,24 +211,20 @@ onlp_ledi_set(onlp_oid_t id, int on_or_off)
  * Only modes reported in the LED's capabilities will be attempted.
  */
 int
-onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
+onlp_ledi_mode_set(onlp_oid_id_t id, onlp_led_mode_t mode)
 {
-    int  fd, len, driver_mode, nbytes=1, local_id;
+    int  fd, len, driver_mode, nbytes=1;
     char data[2] = {0};
     char fullpath[50] = {0};
 
-    VALIDATE(id);
-
-    local_id = ONLP_OID_ID_GET(id);
-
     /* get fullpath */
-    if (strchr(last_path[local_id], '/') != NULL)
+    if (strchr(last_path[id], '/') != NULL)
 	{
-        sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
+        sprintf(fullpath, "%s%s", prefix_path, last_path[id]);
 	}
 	else
 	{
-        sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
+        sprintf(fullpath, "%s%s/%s", prefix_path, last_path[id], filename);
     }
 
 	driver_mode = conver_led_light_mode_to_driver(mode);
@@ -278,12 +245,3 @@ onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
     close(fd);
     return ONLP_STATUS_OK;
 }
-
-/*
- * Generic LED ioctl interface.
- */
-int
-onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
-{
-    return ONLP_STATUS_E_UNSUPPORTED;
-}

packages/platforms/accton/x86-64/as5812-54x/onlp/builds/x86_64_accton_as5812_54x/module/src/psui.c

@@ -212,6 +212,12 @@ static onlp_psu_info_t pinfo[] =
     }
 };
 
+int
+onlp_psui_id_validate(onlp_oid_id_t id)
+{
+    return ONLP_OID_ID_VALIDATE_RANGE(id, 1, AIM_ARRAYSIZE(pinfo) - 1);
+}
+
 int
 onlp_psui_info_get(onlp_oid_id_t id, onlp_psu_info_t* info)
 {

packages/platforms/accton/x86-64/as5812-54x/onlp/builds/x86_64_accton_as5812_54x/module/src/thermali.c

@@ -68,16 +68,12 @@ static onlp_thermal_info_t linfo[] = {
 	ONLP_PSU_THERMAL_INFO_ENTRY_INIT(THERMAL_1_ON_PSU2, "PSU-2 Thermal Sensor 1", 2),
 };
 
-/*
- * Retrieve the information structure for the given thermal OID.
- *
- * If the OID is invalid, return ONLP_E_STATUS_INVALID.
- * If an unexpected error occurs, return ONLP_E_STATUS_INTERNAL.
- * Otherwise, return ONLP_STATUS_OK with the OID's information.
- *
- * Note -- it is expected that you fill out the information
- * structure even if the sensor described by the OID is not present.
- */
+int
+onlp_thermali_id_validate(onlp_oid_id_t id)
+{
+    return ONLP_OID_ID_VALIDATE_RANGE(id, 1, AIM_ARRAYSIZE(linfo));
+}
+
 int
 onlp_thermali_info_get(onlp_oid_id_t id, onlp_thermal_info_t* info)
 {

packages/platforms/accton/x86-64/as7712-32x/onlp/builds/Makefile

@@ -1,2 +1 @@
-FILTER=x86_64_accton_as7712_32x
-include $(ONL)/make/subdirs.mk
+include $(ONL)/packages/base/any/onlp/builds/platform/build.mk