Merge pull request #21 from zhang-rui/staging

intel-lpmd 0.0.3 release

Makefile.am

@@ -39,7 +39,8 @@ intel_lpmd_LDADD = \
 	$(SYSTEMD_LIBS)
 
 BUILT_SOURCES = \
-	intel_lpmd_dbus_interface.h
+	intel_lpmd_dbus_interface.h	\
+	lpmd-resource.c
 
 intel_lpmd_SOURCES = \
 	src/lpmd_main.c \
@@ -51,12 +52,17 @@ intel_lpmd_SOURCES = \
 	src/lpmd_hfi.c \
 	src/lpmd_irq.c \
 	src/lpmd_socket.c \
-	src/lpmd_util.c
+	src/lpmd_util.c	\
+	lpmd-resource.c
 
 man8_MANS = man/intel_lpmd.8
 man5_MANS = man/intel_lpmd_config.xml.5
 
 intel_lpmd_dbus_interface.h: $(top_srcdir)/src/intel_lpmd_dbus_interface.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=dbus_interface --mode=glib-server --output=$@ $<
 
+lpmd-resource.c: $(top_srcdir)/lpmd-resource.gresource.xml
+	$(AM_V_GEN) glib-compile-resources --generate-source lpmd-resource.gresource.xml
+
+
 CLEANFILES = $(BUILT_SOURCES)

configure.ac

@@ -1,7 +1,7 @@
 AC_PREREQ(1.0)
 
 m4_define([lpmd_major_version], [0])
-m4_define([lpmd_minor_version], [0.2])
+m4_define([lpmd_minor_version], [0.3])
 m4_define([lpmd_version],
           [lpmd_major_version.lpmd_minor_version])
 
@@ -96,4 +96,10 @@ AS_IF([test "x$enable_werror" != "xno"], [CFLAGS="$CFLAGS -Werror"])
 AC_CONFIG_FILES([Makefile
                  data/Makefile])
 
+AC_ARG_ENABLE(gdbus,
+              [AS_HELP_STRING([--disable-gdbus],
+                              [Switch DBus backend to glib-dbus. (Default: GDBus)])],
+              [],
+              [AC_DEFINE([GDBUS], [1], [Enable GDBus support])])
+
 AC_OUTPUT

lpmd-resource.gresource.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/freedesktop/intel_lpmd">
+    <file preprocess="xml-stripblanks">src/intel_lpmd_dbus_interface.xml</file>
+  </gresource>
+</gresources>

src/lpmd.h

@@ -181,8 +181,9 @@ int get_util_exit_hyst(void);
 void set_ignore_itmt(void);
 
 int process_lpm(enum lpm_command cmd);
-int enter_lpm(enum lpm_command cmd);
-int exit_lpm(enum lpm_command cmd);
+int process_lpm_unlock(enum lpm_command cmd);
+int freeze_lpm(void);
+int restore_lpm(void);
 
 void lpmd_terminate(void);
 void lpmd_force_on(void);
@@ -221,6 +222,8 @@ int has_cpus(enum cpumask_idx idx);
 int add_cpu(int cpu, enum cpumask_idx idx);
 void reset_cpus(enum cpumask_idx idx);
 int set_lpm_cpus(enum cpumask_idx new);
+int uevent_init(void);
+int check_cpu_hotplug(void);
 
 /* cpu.c : APIs for SUV mode support */
 int process_suv_mode(enum lpm_command cmd);