Updated to the latest MBI interface. Bug fixes. Makefile updates.

Author: bgeltz

Products/ESIF_LF/Sources/esif_lf_ccb_mbi.h

@@ -136,8 +136,7 @@
 #ifdef ESIF_ATTR_KERNEL
 
 #ifdef ESIF_ATTR_IOSF
-extern u32 bt_mbi_read(u8, u8, u32, u32*);
-extern u32 bt_mbi_write(u8, u8, u32, u32);
+#include <asm/iosf_mbi.h>
 #endif
 
 /* MBI Read 32 */
@@ -155,7 +154,7 @@ static ESIF_INLINE enum esif_rc esif_ccb_mbi_read(
 
 #else
 #ifdef ESIF_ATTR_IOSF
-	return bt_mbi_read(port, 0x10, punit, val_ptr);
+	return iosf_mbi_read(port, 0x10, punit, val_ptr);
 #else
 	*val_ptr = 0;
 	return ESIF_E_NOT_IMPLEMENTED;
@@ -179,7 +178,7 @@ static ESIF_INLINE enum esif_rc esif_ccb_mbi_write(
 	return esif_lf_win_mbi_write(MCR, val);
 #else
 #ifdef ESIF_ATTR_IOSF
-	return bt_mbi_write(port, 0x11, punit, val);
+	return iosf_mbi_write(port, 0x11, punit, val);
 #else
 	return ESIF_E_NOT_IMPLEMENTED;
 

Products/ESIF_UF/Androidx86/jni/Android.mk

@@ -17,10 +17,10 @@
 ################################################################################
 include $(CLEAR_VARS)
 
-LOCAL_PATH := ../../
-LOCAL_CFLAGS    := -DESIF_ATTR_OS_ANDROID -DESIF_ATTR_USER -Wno-multichar
-LOCAL_MODULE    := esif_uf 
-LOCAL_C_INCLUDES := ../../ESIF_CM/Sources ../../ESIF_UF/Sources ../../ESIF_WS/Sources ../../ESIF_LIB/Sources
+LOCAL_PATH := ../../../
+LOCAL_CFLAGS    := -DESIF_ATTR_OS_ANDROID -DESIF_ATTR_DAEMON -DESIF_ATTR_USER -Wno-multichar
+LOCAL_MODULE    := esif_ufd 
+LOCAL_C_INCLUDES := ../../../ESIF_CM/Sources ../../../ESIF_UF/Sources ../../../ESIF_WS/Sources ../../../ESIF_LIB/Sources
 
 LOCAL_SRC_FILES := ESIF_UF/Sources/lin/main.c
 LOCAL_SRC_FILES += ESIF_LF/Sources/lin/esif_ipc_os_lin.c

Products/ESIF_UF/Chrome86/Makefile renamed to Products/ESIF_UF/Chrome/Makefile

@@ -29,7 +29,6 @@ ESIF_LIB_SOURCES := $(ESIF_SOURCES)/ESIF_LIB/Sources
 
 LDLIBS := -lpthread -ldl -lrt 
 
-CFLAGS ?= -m32
 CFLAGS += -Wno-multichar
 CPPFLAGS += -I$(ESIF_UF_SOURCES) -I$(ESIF_CM_SOURCES) -I$(ESIF_LF_SOURCES) 
 CPPFLAGS += -I$(ESIF_WS_SOURCES) -I$(ESIF_LIB_SOURCES)

Products/ESIF_UF/Chrome64/Makefile

@@ -84,15 +84,14 @@ extern int EsifConsole_WriteLogFile(const char *format, va_list args);
 //
 // Set Architecture
 //
-#ifdef ESIF_ATTR_64BIT
-	#if defined(ESIF_ATTR_OS_LINUX) || defined(ESIF_ATTR_OS_ANDROID) || \
-		defined(ESIF_ATTR_OS_CHROME)
-			#define ESIF_DIR_PRG NULL
-			#define ESIF_DIR_DPTF_POL "/usr/share/dptf"
-	#else
-		#define ESIF_DIR_PRG "ufx64"
-		#define ESIF_DIR_DPTF_POL "ufx64"
-	#endif
+#if defined(ESIF_ATTR_OS_LINUX) || defined(ESIF_ATTR_OS_ANDROID) || \
+	defined(ESIF_ATTR_OS_CHROME)
+	// No differentiation for 32-bit or 64-bit *nix build
+	#define ESIF_DIR_PRG NULL
+	#define ESIF_DIR_DPTF_POL "/usr/share/dptf"
+#elif defined(ESIF_ATTR_64BIT)
+	#define ESIF_DIR_PRG "ufx64"
+	#define ESIF_DIR_DPTF_POL "ufx64"
 #else
 	#define ESIF_DIR_PRG "ufx86"
 	#define ESIF_DIR_DPTF_POL "ufx86"

Products/ESIF_UF/Sources/esif_uf.h

@@ -59,6 +59,10 @@ char g_esif_kernel_version[64] = "NA";
 #include "esif_uf_app.h"
 extern struct esif_uf_dm g_dm;
 
+#if defined(ESIF_ATTR_OS_LINUX) || defined(ESIF_ATTR_OS_CHROME)
+#include <sys/utsname.h>
+#endif
+
 #ifdef ESIF_ATTR_OS_WINDOWS
 //
 // The Windows banned-API check header must be included after all other headers, or issues can be identified
@@ -314,11 +318,23 @@ void esif_init()
 {
 	char command[64];
 
-	EsifString os_arch = NULL;
+	EsifString os_arch = (EsifString)"Unknown";
 	EsifString build   = NULL;
 	static u8 first    = ESIF_TRUE;
 
-#ifdef ESIF_ATTR_64BIT
+#if defined(ESIF_ATTR_OS_LINUX) || defined(ESIF_ATTR_OS_CHROME)
+	// For Linux/Chrome we use uname system call to obtain archtecture string
+	// By doing so we can merge the two 32-bit and 64-bit makefiles into one
+	struct utsname kernel_name;
+	const EsifString x64_str="x86_64";
+	const EsifString x86_str="i686";
+	if (!uname(&kernel_name)) {
+		if (!strncmp(kernel_name.machine, x64_str, strlen(x64_str)))
+			os_arch = (EsifString)"x64";
+		else if (!strncmp(kernel_name.machine, x86_str, strlen(x86_str)))
+			os_arch = (EsifString)"x86";
+	}
+#elif defined(ESIF_ATTR_64BIT)
 	os_arch = (EsifString)"x64";
 #else
 	os_arch = (EsifString)"x86";

Products/ESIF_UF/Sources/esif_uf_shell.c

@@ -303,11 +303,11 @@ void esif_ws_socket_build_payload (
 	} else if (dataLength <= 0xFFFF) {
 		outgoingFrame[1]     = 126;
 		payLoadLength        = htons((UInt16)dataLength);
-		esif_ccb_memcpy(&outgoingFrame[2], &payLoadLength, 2);
+		esif_ccb_memcpy(&outgoingFrame[2], &payLoadLength, sizeof(UInt16));
 		*outgoingFrameLenght = 4;
 	} else {
 		outgoingFrame[1]     = 127;
-		esif_ccb_memcpy(&outgoingFrame[2], &dataLength, 8);
+		esif_ccb_memcpy(&outgoingFrame[2], &dataLength, sizeof(size_t));
 		*outgoingFrameLenght = 10;
 	}