added preliminary libshims linking solution

Author: j005u

.gitignore

@@ -0,0 +1,3 @@
+*.o
+osd_dji
+msp_displayport_mux

Makefile.dji

@@ -3,19 +3,39 @@ CFLAGS=-I. -O2
 DEPS = msp.h msp_displayport.h network.h serial.h
 DISPLAYPORT_MUX_OBJ = msp_displayport_mux.o serial.o network.o msp.o
 OSD_DJI_OBJ = osd_dji_udp.o network.o msp.o msp_displayport.o dji_display.o dji_services.o
-OSD_DJI_LIBS := -lduml_hal
-ifneq ($(DJI_LIB_PATH),)
-   OSD_DJI_LIBS := -L$(DJI_LIB_PATH) -lduml_hal
-endif
+LIB_SHIMS = libshims/libduml_hal.so
+#OSD_DJI_LIBS := -lduml_hal
+#ifneq ($(DJI_LIB_PATH),)
+OSD_DJI_LIBS := -L./libshims -lduml_hal
+#endif
+
+.PHONY: libshims
 
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 
+all: msp_displayport_mux osd_dji
+
 msp_displayport_mux: $(DISPLAYPORT_MUX_OBJ)
 	$(CC) -o $@ $^ $(CFLAGS)
 
 osd_dji: $(OSD_DJI_OBJ)
+	$(MAKE) -f Makefile.dji libshims
 	$(CC) -o $@ $^ $(CFLAGS) $(OSD_DJI_LIBS)
 
+#this doesn't work by default
+#an extra duss_result_t(frame_pop_handler)
+#is generated that the compiler doesn't like 
+libshims/%.c: %.h
+	stubgen -g -e .c -l -N -t libshims -p "../" -n $<
+
+libshims/lib%.so: libshims/%.c
+	$(CC) -Wno-c2x-extensions -O2 -shared -o $@ $<
+	
+libshims: $(LIB_SHIMS)
+
 clean: 
 	rm -rf *.o
+	rm -rf libshims/*.so
+	rm -rf msp_displayport_mux
+	rm -rf osd_dji

dji_display.h

@@ -1,4 +1,4 @@
-#include "duss_hal.h"
+#include "duml_hal.h"
 
 typedef struct dji_display_state_s {
     duss_disp_plane_id_t plane_id;

duss_hal.h renamed to duml_hal.h

@@ -0,0 +1,202 @@
+#include "../duml_hal.h"
+
+duss_result_t duss_hal_initialize(duss_hal_device_desc_t *)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_deinitialize()
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_device_open(char *device_name, void *unknown, duss_hal_obj_handle_t *)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_device_start(duss_hal_obj_handle_t, void *)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_device_close(duss_hal_obj_handle_t)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_device_stop(duss_hal_obj_handle_t)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_mem_alloc(duss_hal_obj_handle_t, duss_hal_mem_handle_t *, uint32_t size, uint32_t, uint32_t, uint32_t)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_mem_get_phys_addr(duss_hal_mem_handle_t, void **)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_mem_map(duss_hal_mem_handle_t, void **)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_mem_free(duss_hal_mem_handle_t)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_mem_sync(duss_hal_mem_handle_t, uint32_t)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_open(duss_hal_obj_handle_t, duss_disp_instance_handle_t **, duss_disp_vop_id_t)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_close(duss_hal_obj_handle_t, duss_disp_instance_handle_t **)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_aquire_plane(duss_disp_instance_handle_t *, duss_disp_plane_type_t, duss_disp_plane_id_t *)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_reset(duss_disp_instance_handle_t *)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_register_frame_cycle_callback(duss_disp_instance_handle_t *, duss_disp_plane_id_t, frame_pop_handler *, void *)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_timing_detail_get(duss_disp_instance_handle_t *, duss_disp_timing_detail_t *)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_port_enable(duss_disp_instance_handle_t *, duss_disp_port_id_t, uint8_t)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_plane_blending_set(duss_disp_instance_handle_t *, duss_disp_plane_id_t, duss_disp_plane_blending_t *)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_release_plane(duss_disp_instance_handle_t *, duss_disp_plane_id_t)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_display_push_frame(duss_disp_instance_handle_t *, duss_disp_plane_id_t, duss_frame_buffer_t *)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_attach_disp(char *param_1, duss_hal_obj **param_2)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_attach_ion_mem(char *param_1, duss_hal_obj **param_2)
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_detach_ion_mem()
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+
+duss_result_t duss_hal_detach_disp()
+{
+    duss_result_t dummy;
+
+    return dummy;
+}
+
+