Add BCM support

Author: widgetii

CMakeLists.txt

@@ -38,6 +38,8 @@ include_directories(./src/)
 set(COMMON_LIB_SRC
     src/chipid.c
     src/chipid.h
+    src/hal/bcm.c
+    src/hal/bcm.h
     src/hal/common.c
     src/hal/common.h
     src/hal/fh.c

src/chipid.c

@@ -35,7 +35,7 @@ static long get_uart0_address() {
 }
 
 typedef struct {
-    const char *hardware_pattern;
+    const char *pattern;
     bool (*detect_fn)(char *);
     const char *override_vendor;
     void (*setup_hal_fn)(void);
@@ -50,9 +50,10 @@ static const manufacturers_t manufacturers[] = {
     {"MStar", mstar_detect_cpu, NULL, sstar_setup_hal},
     {"Novatek", novatek_detect_cpu, NULL, novatek_setup_hal},
     {"Grain-Media", gm_detect_cpu, NULL, gm_setup_hal},
-    {"FH", fh_detect_cpu, "Fullhan", setup_hal_fh},
-    {NULL /* Generic */, rockchip_detect_cpu, "Rockchip", setup_hal_rockchip},
-    {"Xilinx", xilinx_detect_cpu, NULL, setup_hal_xilinx},
+    {"FH", fh_detect_cpu, "Fullhan", fh_setup_hal},
+    {NULL /* Generic */, rockchip_detect_cpu, "Rockchip", rockchip_setup_hal},
+    {"Xilinx", xilinx_detect_cpu, NULL, xilinx_setup_hal},
+    {"BCM", bcm_detect_cpu, NULL, bcm_setup_hal}
 #endif
 #if defined(__aarch64__) || defined(_M_ARM64)
     {NULL, tegra_detect_cpu, "Nvidia", tegra_setup_hal},
@@ -72,8 +73,9 @@ static bool generic_detect_cpu() {
     strcpy(chip_manufacturer, buf);
 
     for (size_t i = 0; i < ARRCNT(manufacturers); i++) {
-        if (manufacturers[i].hardware_pattern &&
-            strcmp(manufacturers[i].hardware_pattern, chip_manufacturer))
+        if (manufacturers[i].pattern &&
+            strncmp(manufacturers[i].pattern, chip_manufacturer,
+                    strlen(manufacturers[i].pattern)))
             continue;
 
         if (manufacturers[i].detect_fn(chip_name)) {

src/ethernet.c

@@ -1,4 +1,5 @@
 #include "ethernet.h"
+
 #include "cjson/cYAML.h"
 #include "hal/common.h"
 #include "network.h"

src/ethernet.h

@@ -1,6 +1,8 @@
 #ifndef ETHERNET_H
 #define ETHERNET_H
 
+#include "cjson/cJSON.h"
+
 cJSON *detect_ethernet();
 
 #endif /* ETHERNET_H */

src/hal/bcm.c

@@ -0,0 +1,47 @@
+#include "hal/bcm.h"
+
+#include "hal/common.h"
+#include "tools.h"
+
+#include <string.h>
+
+#ifndef STANDALONE_LIBRARY
+#include "cjson/cJSON.h"
+#endif
+
+bool bcm_detect_cpu(char *chip_name) {
+    char buf[256];
+
+    if (!get_regex_line_from_file("/proc/cpuinfo", "Hardware.+: (BCM[0-9-]+)",
+                                  buf, sizeof(buf)))
+        return false;
+
+    strcpy(chip_name, buf);
+
+    return true;
+}
+
+#ifndef STANDALONE_LIBRARY
+static void cpuinfo_param(cJSON *j_inner, char *name) {
+    char out[256], pattern[256];
+
+    snprintf(pattern, sizeof(pattern), "%s.+: (.+)", name);
+    if (!get_regex_line_from_file("/proc/cpuinfo", pattern, out, sizeof(out)))
+        return;
+
+    lsnprintf(pattern, sizeof(pattern), name);
+    ADD_PARAM(pattern, out);
+}
+
+static void chip_properties(cJSON *j_inner) {
+    cpuinfo_param(j_inner, "Revision");
+    cpuinfo_param(j_inner, "Serial");
+    cpuinfo_param(j_inner, "Model");
+}
+#endif
+
+void bcm_setup_hal() {
+#ifndef STANDALONE_LIBRARY
+    hal_chip_properties = chip_properties;
+#endif
+}

src/hal/bcm.h

@@ -0,0 +1,9 @@
+#ifndef BCM_H
+#define BCM_H
+
+#include <stdbool.h>
+
+bool bcm_detect_cpu(char *chip_name);
+void bcm_setup_hal();
+
+#endif /* BCM_H */

src/hal/common.h

@@ -7,6 +7,7 @@
 #include <sys/ioctl.h>
 
 #include "cjson/cJSON.h"
+#include "hal/bcm.h"
 #include "hal/fh.h"
 #include "hal/gm.h"
 #include "hal/hisi/hal_hisi.h"

src/hal/fh.c

@@ -130,7 +130,7 @@ float fh_get_temp() {
     return ret;
 }
 
-void setup_hal_fh() {
+void fh_setup_hal() {
     possible_i2c_addrs = fh_possible_i2c_addrs;
     if (!access("/sys/class/thermal/thermal_zone0/temp", R_OK))
         hal_temperature = fh_get_temp;

src/hal/fh.h

@@ -11,6 +11,6 @@
 
 bool fh_detect_cpu(char *chip_name);
 unsigned long fh_totalmem(unsigned long *media_mem);
-void setup_hal_fh();
+void fh_setup_hal();
 
 #endif /* HAL_FH_H */

src/hal/rockchip.c

@@ -85,7 +85,7 @@ static int i2c1_open_sensor_fd() {
     return universal_open_sensor_fd("/dev/i2c-1");
 }
 
-void setup_hal_rockchip() {
+void rockchip_setup_hal() {
     possible_i2c_addrs = rockchip_possible_i2c_addrs;
     open_i2c_sensor_fd = i2c1_open_sensor_fd;
     if (!access("/sys/class/thermal/thermal_zone0/temp", R_OK))