summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS9
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.am7
-rw-r--r--NEWS1
-rw-r--r--configure.ac96
-rw-r--r--doc/Doxyfile.in3
-rw-r--r--doc/main.dox10
-rw-r--r--m4/efl.m413
-rw-r--r--old/ChangeLog.eeze (renamed from legacy/eeze/ChangeLog)0
-rw-r--r--old/NEWS.eeze (renamed from legacy/eeze/NEWS)0
-rw-r--r--old/README.eeze (renamed from legacy/eeze/README)0
-rw-r--r--pc/eeze.pc.in (renamed from legacy/eeze/eeze.pc.in)3
-rw-r--r--src/Makefile.am5
-rw-r--r--src/Makefile_Eeze.am166
-rw-r--r--src/bin/eeze/eeze_disk_ls.c (renamed from legacy/eeze/src/bin/eeze_disk_ls.c)0
-rw-r--r--src/bin/eeze/eeze_mount.c (renamed from legacy/eeze/src/bin/eeze_mount.c)0
-rw-r--r--src/bin/eeze/eeze_scanner.c (renamed from legacy/eeze/src/bin/eeze_scanner.c)14
-rw-r--r--src/bin/eeze/eeze_scanner.h (renamed from legacy/eeze/src/bin/eeze_scanner.h)0
-rw-r--r--src/bin/eeze/eeze_sensor_test.c (renamed from legacy/eeze/src/bin/eeze_sensor_test.c)0
-rw-r--r--src/bin/eeze/eeze_udev_test.c (renamed from legacy/eeze/src/bin/eeze_udev_test.c)0
-rw-r--r--src/bin/eeze/eeze_umount.c (renamed from legacy/eeze/src/bin/eeze_umount.c)0
-rw-r--r--src/lib/eeze/Eeze.h (renamed from legacy/eeze/src/lib/Eeze.h)142
-rw-r--r--src/lib/eeze/Eeze_Disk.h (renamed from legacy/eeze/src/lib/Eeze_Disk.h)6
-rw-r--r--src/lib/eeze/Eeze_Net.h (renamed from legacy/eeze/src/lib/Eeze_Net.h)5
-rw-r--r--src/lib/eeze/Eeze_Sensor.h (renamed from legacy/eeze/src/lib/Eeze_Sensor.h)9
-rw-r--r--src/lib/eeze/eeze_disk.c (renamed from legacy/eeze/src/lib/eeze_disk.c)13
-rw-r--r--src/lib/eeze/eeze_disk_libmount.c (renamed from legacy/eeze/src/lib/eeze_disk_libmount.c)6
-rw-r--r--src/lib/eeze/eeze_disk_libmount_new.c (renamed from legacy/eeze/src/lib/eeze_disk_libmount_new.c)8
-rw-r--r--src/lib/eeze/eeze_disk_mount.c (renamed from legacy/eeze/src/lib/eeze_disk_mount.c)8
-rw-r--r--src/lib/eeze/eeze_disk_private.h (renamed from legacy/eeze/src/lib/eeze_disk_private.h)0
-rw-r--r--src/lib/eeze/eeze_disk_udev.c (renamed from legacy/eeze/src/lib/eeze_disk_udev.c)0
-rw-r--r--src/lib/eeze/eeze_main.c (renamed from legacy/eeze/src/lib/eeze_main.c)2
-rw-r--r--src/lib/eeze/eeze_net.c (renamed from legacy/eeze/src/lib/eeze_net.c)4
-rw-r--r--src/lib/eeze/eeze_net_private.h (renamed from legacy/eeze/src/lib/eeze_net_private.h)0
-rw-r--r--src/lib/eeze/eeze_sensor.c (renamed from legacy/eeze/src/lib/eeze_sensor.c)2
-rw-r--r--src/lib/eeze/eeze_sensor_private.h (renamed from legacy/eeze/src/lib/eeze_sensor_private.h)4
-rw-r--r--src/lib/eeze/eeze_udev_find.c (renamed from legacy/eeze/src/lib/eeze_udev_find.c)0
-rw-r--r--src/lib/eeze/eeze_udev_private.c (renamed from legacy/eeze/src/lib/eeze_udev_private.c)0
-rw-r--r--src/lib/eeze/eeze_udev_private.h (renamed from legacy/eeze/src/lib/eeze_udev_private.h)0
-rw-r--r--src/lib/eeze/eeze_udev_syspath.c (renamed from legacy/eeze/src/lib/eeze_udev_syspath.c)0
-rw-r--r--src/lib/eeze/eeze_udev_walk.c (renamed from legacy/eeze/src/lib/eeze_udev_walk.c)0
-rw-r--r--src/lib/eeze/eeze_udev_watch.c (renamed from legacy/eeze/src/lib/eeze_udev_watch.c)0
-rw-r--r--src/modules/eeze/eeze_sensor_fake.c (renamed from legacy/eeze/src/modules/eeze_sensor_fake.c)0
-rw-r--r--src/modules/eeze/eeze_sensor_tizen.c (renamed from legacy/eeze/src/modules/eeze_sensor_tizen.c)0
-rw-r--r--src/tests/eeze/eeze_suite.c (renamed from legacy/eeze/src/tests/eeze_suite.c)4
45 files changed, 451 insertions, 90 deletions
diff --git a/AUTHORS b/AUTHORS
index 0f0cedd077..ffecf8766c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -226,3 +226,12 @@ Nathan 'RbdPngn' Ingersoll
226Nicholas 'Mekius' Hughart 226Nicholas 'Mekius' Hughart
227Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com> 227Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>
228Mathieu Taillefumier <mathieu.taillefumier@free.fr> 228Mathieu Taillefumier <mathieu.taillefumier@free.fr>
229
230
231Eeze
232----
233Mike Blumenkrantz (zmike/discomfitor) <michael.blumenkrantz@gmail.com>
234Cedric Bail <cedric@efl.so>
235Mikael Sans <sans.mikael@gmail.com>
236Christophe Dumez <christophe.dumez@intel.com>
237Stefan Schmidt <stefan@datenfreihafen.org>
diff --git a/ChangeLog b/ChangeLog
index 1a0b82f71f..cb77d720fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
12013-01-03 Gustavo Sverzut Barbieri (k-s) 12013-01-03 Gustavo Sverzut Barbieri (k-s)
2 2
3 * Add eina_alloc.h to Eina.h to define alloca() 3 * Add eina_alloc.h to Eina.h to define alloca()
4 * Eeze: deprecated support for udev<148 and libmount<2.18
4 5
52013-01-03 Cedric Bail 62013-01-03 Cedric Bail
6 7
diff --git a/Makefile.am b/Makefile.am
index ca0b6687ee..c28cb4869c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,8 @@ pc/eio.pc \
98pc/edbus2.pc \ 98pc/edbus2.pc \
99pc/efreet.pc \ 99pc/efreet.pc \
100pc/efreet-mime.pc \ 100pc/efreet-mime.pc \
101pc/efreet-trash.pc 101pc/efreet-trash.pc \
102pc/eeze.pc
102 103
103pkgconfigdir = $(libdir)/pkgconfig 104pkgconfigdir = $(libdir)/pkgconfig
104pkgconfig_DATA = 105pkgconfig_DATA =
@@ -208,6 +209,10 @@ if HAVE_ECORE_X
208pkgconfig_DATA += pc/ecore-x.pc 209pkgconfig_DATA += pc/ecore-x.pc
209endif 210endif
210 211
212if HAVE_EEZE
213pkgconfig_DATA += pc/eeze.pc
214endif
215
211 216
212# D-Bus services: 217# D-Bus services:
213 218
diff --git a/NEWS b/NEWS
index 01e4ad1326..f46081e356 100644
--- a/NEWS
+++ b/NEWS
@@ -58,6 +58,7 @@ Deprecations:
58 ecore_x_e_window_profile_list_set() 58 ecore_x_e_window_profile_list_set()
59 ecore_x_e_window_profile_list_get() 59 ecore_x_e_window_profile_list_get()
60 * ecore_evas: deprecate DirectFB, XRender, WinCE, X11-16 and X11-8. 60 * ecore_evas: deprecate DirectFB, XRender, WinCE, X11-16 and X11-8.
61 * eeze: deprecate libudev<148 and libmount<2.18
61 62
62Removed: 63Removed:
63 * directfb support: ecore_directfb and evas directfb engine. 64 * directfb support: ecore_directfb and evas directfb engine.
diff --git a/configure.ac b/configure.ac
index 8206881a9d..c53c4b2c6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3125,6 +3125,99 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
3125EFL_LIB_END([Efreet]) 3125EFL_LIB_END([Efreet])
3126#### End of Efreet 3126#### End of Efreet
3127 3127
3128#### Eeze
3129EFL_LIB_START_OPTIONAL([Eeze], [test "${have_linux}" = "yes"])
3130
3131### Additional options to configure
3132AC_ARG_ENABLE([tizen],
3133 [AC_HELP_STRING([--enable-tizen],
3134 [enable tizen support. @<:@default=disabled@:>@])],
3135 [
3136 if test "x${enableval}" = "xyes" ; then
3137 want_tizen="yes"
3138 else
3139 want_tizen="no"
3140 fi
3141 ],
3142 [want_tizen="no"])
3143
3144AC_ARG_ENABLE([mount],
3145 [AC_HELP_STRING([--disable-mount],
3146 [disable mount support (libmount). @<:@default=enabled@:>@])],
3147 [
3148 if test "x${enableval}" = "xyes" ; then
3149 want_mount="yes"
3150 else
3151 want_mount="no"
3152 fi
3153 ],
3154 [want_mount="yes"])
3155
3156AC_ARG_WITH([mount],
3157 [AS_HELP_STRING([--with-mount], [specify mount bin @<:@default=detect@:>@])],
3158 [with_eeze_mount=$withval], [with_eeze_mount="detect"])
3159AC_ARG_WITH([umount],
3160 [AS_HELP_STRING([--with-umount], [specify umount bin @<:@default=detect@:>@])],
3161 [with_eeze_umount=$withval], [with_eeze_umount="detect"])
3162AC_ARG_WITH([eject],
3163 [AS_HELP_STRING([--with-eject], [specify eject bin @<:@default=detect@:>@])],
3164 [with_eeze_eject=$withval], [with_eeze_eject="detect"])
3165
3166### Default values
3167
3168### Checks for programs
3169
3170### Checks for libraries
3171EFL_INTERNAL_DEPEND_PKG([EEZE], [eina])
3172EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore])
3173EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-file])
3174EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-con])
3175EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${wantx_mount}], [eet])
3176
3177EFL_DEPEND_PKG([EEZE], [UDEV], [libudev >= 148])
3178EFL_OPTIONAL_DEPEND_PKG([EEZE], [${want_mount}], [EEZE_MOUNT], [mount >= 2.19.0])
3179
3180## modules
3181if test "${want_tizen}" = "yes"; then
3182 PKG_CHECK_MODULES([TIZEN_SENSOR], [capi-system-sensor])
3183fi
3184
3185EFL_EVAL_PKGS([EEZE])
3186
3187AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "${want_mount}" = "yes"])
3188AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "${want_tizen}" = "yes"])
3189
3190### Checks for header files
3191
3192### Checks for types
3193
3194### Checks for structures
3195
3196### Checks for compiler characteristics
3197
3198### Checks for linker characteristics
3199
3200### Checks for library functions
3201
3202### Checks for binaries
3203if test "x$with_eeze_mount" = "xdetect"; then
3204 AC_PATH_PROG([with_eeze_mount], [mount], [])
3205fi
3206AC_DEFINE_UNQUOTED([EEZE_MOUNT_BIN], ["$with_eeze_mount"], [mount bin to use])
3207
3208if test "x$with_eeze_umount" = "xdetect";then
3209 AC_PATH_PROG([with_eeze_umount], [umount], [])
3210fi
3211AC_DEFINE_UNQUOTED([EEZE_UNMOUNT_BIN], ["$with_eeze_umount"], [umount bin to use])
3212
3213if test "x$with_eeze_eject" = "xdetect";then
3214 AC_PATH_PROG([with_eeze_eject], [eject], [])
3215fi
3216AC_DEFINE_UNQUOTED([EEZE_EJECT_BIN], ["$with_eeze_eject"], [eject bin to use])
3217
3218EFL_LIB_END_OPTIONAL([Eeze])
3219#### End of Eeze
3220
3128AC_CONFIG_FILES([ 3221AC_CONFIG_FILES([
3129Makefile 3222Makefile
3130data/Makefile 3223data/Makefile
@@ -3187,6 +3280,7 @@ pc/edbus2.pc
3187pc/efreet.pc 3280pc/efreet.pc
3188pc/efreet-mime.pc 3281pc/efreet-mime.pc
3189pc/efreet-trash.pc 3282pc/efreet-trash.pc
3283pc/eeze.pc
3190dbus-services/org.enlightenment.Efreet.service 3284dbus-services/org.enlightenment.Efreet.service
3191$po_makefile_in 3285$po_makefile_in
3192]) 3286])
@@ -3390,6 +3484,8 @@ echo " Ecore_Evas...................: $have_ecore_evas"
3390 echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn" 3484 echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn"
3391#fi 3485#fi
3392echo 3486echo
3487
3488echo "Eeze...................: ${efl_lib_optional_eeze} (tizen: ${want_tizen})"
3393echo "Tests..................: ${build_tests}" 3489echo "Tests..................: ${build_tests}"
3394 3490
3395echo "Examples...............: make examples" 3491echo "Examples...............: make examples"
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index ce06e1ebf7..d8a5601b30 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -807,7 +807,8 @@ eet_ _eet_ Eet_ _Eet_ EET_ _EET_ \
807ecore_ _ecore_ Ecore_ _Ecore_ ECORE_ _ECORE_ \ 807ecore_ _ecore_ Ecore_ _Ecore_ ECORE_ _ECORE_ \
808eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \ 808eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \
809edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ \ 809edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ \
810efreet_ _efreet_ Efreet_ _Efreet_ EFREET_ _EFREET_ 810efreet_ _efreet_ Efreet_ _Efreet_ EFREET_ _EFREET_ \
811eeze_ _eeze_ Eeze_ _Eeze_ EEZE_ _EEZE_
811 812
812 813
813#--------------------------------------------------------------------------- 814#---------------------------------------------------------------------------
diff --git a/doc/main.dox b/doc/main.dox
index ef54b214fa..be9f6dc1c2 100644
--- a/doc/main.dox
+++ b/doc/main.dox
@@ -18,6 +18,7 @@
18 * @li @ref eio_main asynchronous input/output 18 * @li @ref eio_main asynchronous input/output
19 * @li @ref edbus_main d-bus integration. 19 * @li @ref edbus_main d-bus integration.
20 * @li @ref efreet_main freedesktop.org (xdg) menu and desktop integration. 20 * @li @ref efreet_main freedesktop.org (xdg) menu and desktop integration.
21 * @li @ref eeze_main hardware device manipulation and notification.
21 * 22 *
22 */ 23 */
23 24
@@ -39,6 +40,7 @@
39 * @author Cedric Bail <cedric.bail@@free.fr> 40 * @author Cedric Bail <cedric.bail@@free.fr>
40 * @author Chidambar Zinnoury <illogict@@online.fr> 41 * @author Chidambar Zinnoury <illogict@@online.fr>
41 * @author Chris Ross <chris@@darkrock.co.uk> 42 * @author Chris Ross <chris@@darkrock.co.uk>
43 * @author Christophe Dumez <christophe.dumez@@intel.com>
42 * @author Christopher 'devilhorns' Michael <cpmichael1@comcast.net> 44 * @author Christopher 'devilhorns' Michael <cpmichael1@comcast.net>
43 * @author ChunEon Park <hermet@@hermet.pe.kr> 45 * @author ChunEon Park <hermet@@hermet.pe.kr>
44 * @author Corey "atmos" Donohoe <atmos@@atmos.org> 46 * @author Corey "atmos" Donohoe <atmos@@atmos.org>
@@ -74,6 +76,7 @@
74 * @author Mathieu Taillefumier <mathieu.taillefumier@@free.fr> 76 * @author Mathieu Taillefumier <mathieu.taillefumier@@free.fr>
75 * @author Matt Barclay <mbarclay@@gmail.com> 77 * @author Matt Barclay <mbarclay@@gmail.com>
76 * @author Michael 'Mickey' Lauer <mickey@@tm.informatik.uni-frankfurt.de> 78 * @author Michael 'Mickey' Lauer <mickey@@tm.informatik.uni-frankfurt.de>
79 * @author Mikael Sans <sans.mikael@@gmail.com>
77 * @author Mike Blumenkrantz <michael.blumenkrantz@@gmail.com> 80 * @author Mike Blumenkrantz <michael.blumenkrantz@@gmail.com>
78 * @author Mike McCormack <mj.mccormack@@samsung.com> 81 * @author Mike McCormack <mj.mccormack@@samsung.com>
79 * @author Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@@samsung.com> <myoungwoon@@gmail.com> 82 * @author Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@@samsung.com> <myoungwoon@@gmail.com>
@@ -183,3 +186,10 @@
183 * 186 *
184 * @brief FreeDesktop.Org (XDG) menu and desktop integration. 187 * @brief FreeDesktop.Org (XDG) menu and desktop integration.
185 */ 188 */
189
190
191/**
192 * @defgroup Eeze
193 *
194 * @brief Hardware device manipulation and notification, wraps UDev and similar.
195 */
diff --git a/m4/efl.m4 b/m4/efl.m4
index 64a5ec7602..a891203e2e 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -105,6 +105,19 @@ m4_pushdef([DOWN], m4_translit([$3], [-A-Z], [_a-z]))dnl
105m4_popdef([DOWN]) 105m4_popdef([DOWN])
106]) 106])
107 107
108dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG(EFL, VARIABLE, NAME)
109AC_DEFUN([EFL_OPTIONAL_INTERNAL_DEPEND_PKG],
110[
111m4_pushdef([DOWN], m4_translit([$3], [-A-Z], [_a-z]))dnl
112
113 have_[]m4_defn([DOWN])="no"
114 if test "x$2" = "xyes"; then
115 EFL_INTERNAL_DEPEND_PKG([$1], [$3])
116 fi
117
118m4_popdef([DOWN])
119])
120
108dnl EFL_ADD_LIBS(PKG, LIBS) 121dnl EFL_ADD_LIBS(PKG, LIBS)
109dnl Add libraries that the EFL library will depend on 122dnl Add libraries that the EFL library will depend on
110dnl See EFL_DEPEND_PKG() for pkg-config version. 123dnl See EFL_DEPEND_PKG() for pkg-config version.
diff --git a/legacy/eeze/ChangeLog b/old/ChangeLog.eeze
index ba3d7c9107..ba3d7c9107 100644
--- a/legacy/eeze/ChangeLog
+++ b/old/ChangeLog.eeze
diff --git a/legacy/eeze/NEWS b/old/NEWS.eeze
index cd23b8cb59..cd23b8cb59 100644
--- a/legacy/eeze/NEWS
+++ b/old/NEWS.eeze
diff --git a/legacy/eeze/README b/old/README.eeze
index 824585990e..824585990e 100644
--- a/legacy/eeze/README
+++ b/old/README.eeze
diff --git a/legacy/eeze/eeze.pc.in b/pc/eeze.pc.in
index 606b789c23..787cf54bf6 100644
--- a/legacy/eeze/eeze.pc.in
+++ b/pc/eeze.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: eeze 6Name: eeze
7Description: device convenience library for efl 7Description: device convenience library for efl
8@pkgconfig_requires_private@: @requirement_eeze@ 8Requires.private: @requirements_pc_eeze@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -leeze 10Libs: -L${libdir} -leeze
11Cflags: -I${includedir}/eeze-@VMAJ@ 11Cflags: -I${includedir}/eeze-@VMAJ@
12Libs: -L${libdir} -leet
diff --git a/src/Makefile.am b/src/Makefile.am
index 8a90462f1d..3d4b5afd88 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,6 +61,9 @@ include Makefile_Embryo.am
61include Makefile_Eio.am 61include Makefile_Eio.am
62include Makefile_EDBus.am 62include Makefile_EDBus.am
63include Makefile_Efreet.am 63include Makefile_Efreet.am
64if HAVE_EEZE
65include Makefile_Eeze.am
66endif
64 67
65.PHONY: benchmark examples 68.PHONY: benchmark examples
66 69
@@ -78,6 +81,7 @@ install-examples:
78clean-local: 81clean-local:
79 rm -rf bin/eet/*.gcno 82 rm -rf bin/eet/*.gcno
80 rm -rf bin/efreet/*.gcno 83 rm -rf bin/efreet/*.gcno
84 rm -rf bin/eeze/*.gcno
81 rm -rf lib/evil/*.gcno 85 rm -rf lib/evil/*.gcno
82 rm -rf lib/eina/*.gcno 86 rm -rf lib/eina/*.gcno
83 rm -rf lib/eo/*.gcno 87 rm -rf lib/eo/*.gcno
@@ -94,6 +98,7 @@ clean-local:
94 rm -rf lib/embryo/*.gcno 98 rm -rf lib/embryo/*.gcno
95 rm -rf lib/edbus/*.gcno 99 rm -rf lib/edbus/*.gcno
96 rm -rf lib/efreet/*.gcno 100 rm -rf lib/efreet/*.gcno
101 rm -rf lib/eeze/*.gcno
97 rm -rf modules/eina/mp/pass_through/*.gcno 102 rm -rf modules/eina/mp/pass_through/*.gcno
98 rm -rf modules/eina/mp/one_big/*.gcno 103 rm -rf modules/eina/mp/one_big/*.gcno
99 rm -rf modules/eina/mp/chained_pool/*.gcno 104 rm -rf modules/eina/mp/chained_pool/*.gcno
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
new file mode 100644
index 0000000000..8e29128a38
--- /dev/null
+++ b/src/Makefile_Eeze.am
@@ -0,0 +1,166 @@
1
2### Library
3
4lib_LTLIBRARIES += \
5lib/eeze/libeeze.la
6
7EEZE_COMMON_CPPFLAGS = \
8-I$(top_srcdir)/src/lib/eina \
9-I$(top_builddir)/src/lib/eina \
10-I$(top_srcdir)/src/lib/eco \
11-I$(top_builddir)/src/lib/eo \
12-I$(top_srcdir)/src/lib/ecore \
13-I$(top_builddir)/src/lib/ecore \
14-I$(top_srcdir)/src/lib/ecore_file \
15-I$(top_builddir)/src/lib/ecore_file \
16-I$(top_srcdir)/src/lib/ecore_con \
17-I$(top_builddir)/src/lib/ecore_con \
18-I$(top_srcdir)/src/lib/eet \
19-I$(top_builddir)/src/lib/eet \
20-I$(top_srcdir)/src/lib/eeze \
21-I$(top_builddir)/src/lib/eeze \
22@EFL_COV_CFLAGS@ \
23@EEZE_CFLAGS@
24
25EEZE_COMMON_LDADD = \
26lib/eina/libeina.la \
27lib/eo/libeo.la \
28lib/ecore/libecore.la \
29@EFL_COV_LIBS@
30
31installed_eezemainheadersdir = $(includedir)/eeze-@VMAJ@
32dist_installed_eezemainheaders_DATA = \
33lib/eeze/Eeze.h \
34lib/eeze/Eeze_Net.h \
35lib/eeze/Eeze_Sensor.h
36
37# libeeze.la
38lib_eeze_libeeze_la_SOURCES = \
39lib/eeze/eeze_main.c \
40lib/eeze/eeze_net.c \
41lib/eeze/eeze_net_private.h \
42lib/eeze/eeze_udev_find.c \
43lib/eeze/eeze_udev_private.h \
44lib/eeze/eeze_udev_private.c \
45lib/eeze/eeze_udev_syspath.c \
46lib/eeze/eeze_udev_walk.c \
47lib/eeze/eeze_udev_watch.c \
48lib/eeze/eeze_sensor_private.h \
49lib/eeze/eeze_sensor.c
50
51if HAVE_EEZE_MOUNT
52dist_installed_eezemainheaders_DATA += lib/eeze/Eeze_Disk.h
53lib_eeze_libeeze_la_SOURCES += \
54lib/eeze/eeze_disk.c \
55lib/eeze/eeze_disk_udev.c \
56lib/eeze/eeze_disk_mount.c \
57lib/eeze/eeze_disk_private.h \
58lib/eeze/eeze_disk_libmount_new.c
59
60EEZE_COMMON_LDADD += \
61lib/ecore_file/libecore_file.la \
62lib/ecore_con/libecore_con.la \
63lib/eet/libeet.la
64endif
65
66EEZE_COMMON_LIBADD = $(EEZE_COMMON_LDADD) @EEZE_LIBS@
67EEZE_COMMON_LDADD += @EEZE_LDFLAGS@
68EEZE_COMMON_USER_LIBADD = $(EEZE_COMMON_LIBADD) lib/eeze/libeeze.la
69EEZE_COMMON_USER_LDADD = $(EEZE_COMMON_LDADD) lib/eeze/libeeze.la
70
71lib_eeze_libeeze_la_CPPFLAGS = \
72$(EEZE_COMMON_CPPFLAGS) \
73-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
74-DPACKAGE_LIB_DIR=\"$(libdir)\" \
75-DEFL_EEZE_BUILD
76
77lib_eeze_libeeze_la_LIBADD = $(EEZE_COMMON_LIBADD)
78lib_eeze_libeeze_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
79
80eezemodulesensordir = $(libdir)/eeze/sensor
81eezemodulesensor_LTLIBRARIES =
82
83if HAVE_EEZE_TIZEN
84eezemodulesensor_LTLIBRARIES += \
85modules/eeze/eeze-sensor-tizen.la
86modules_eeze_eeze_sensor_tizen_la_SOURCES = \
87modules/eeze/eeze_sensor_tizen.c
88modules_eeze_eeze_sensor_tizen_la_CPPFLAGS = \
89$(EEZE_COMMON_CPPFLAGS) \
90@TIZEN_SENSOR_CFLAGS@
91modules_eeze_eeze_sensor_tizen_la_LIBADD = \
92$(EEZE_COMMON_USER_LIBADD) \
93@TIZEN_SENSOR_LIBS@
94modules_eeze_eeze_sensor_tizen_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
95modules_eeze_eeze_sensor_tizen_la_LIBTOOLFLAGS = --tag=disable-static
96else
97
98eezemodulesensor_LTLIBRARIES += \
99modules/eeze/eeze-sensor-fake.la
100modules_eeze_eeze_sensor_fake_la_SOURCES = \
101modules/eeze/eeze_sensor_fake.c
102modules_eeze_eeze_sensor_fake_la_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
103modules_eeze_eeze_sensor_fake_la_LIBADD = $(EEZE_COMMON_USER_LIBADD)
104modules_eeze_eeze_sensor_fake_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
105modules_eeze_eeze_sensor_fake_la_LIBTOOLFLAGS = --tag=disable-static
106endif
107
108### Binary
109
110noinst_PROGRAMS += \
111bin/eeze/eeze_udev_test \
112bin/eeze/eeze_sensor_test
113
114bin_eeze_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test.c
115bin_eeze_eeze_udev_test_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
116bin_eeze_eeze_udev_test_LDADD = $(EEZE_COMMON_USER_LDADD)
117
118bin_eeze_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test.c
119bin_eeze_eeze_sensor_test_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
120bin_eeze_eeze_sensor_test_LDADD = $(EEZE_COMMON_USER_LDADD)
121
122if HAVE_EEZE_MOUNT
123bin_PROGRAMS += \
124bin/eeze/eeze_mount \
125bin/eeze/eeze_umount \
126bin/eeze/eeze_disk_ls \
127bin/eeze/eeze_scanner
128
129bin_eeze_eeze_mount_SOURCES = bin/eeze/eeze_mount.c
130bin_eeze_eeze_mount_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
131bin_eeze_eeze_mount_LDADD = $(EEZE_COMMON_USER_LDADD)
132
133bin_eeze_eeze_umount_SOURCES = bin/eeze/eeze_umount.c
134bin_eeze_eeze_umount_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
135bin_eeze_eeze_umount_LDADD = $(EEZE_COMMON_USER_LDADD)
136
137bin_eeze_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls.c
138bin_eeze_eeze_disk_ls_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
139bin_eeze_eeze_disk_ls_LDADD = $(EEZE_COMMON_USER_LDADD)
140
141bin_eeze_eeze_scanner_SOURCES = \
142bin/eeze/eeze_scanner.c \
143bin/eeze/eeze_scanner.h
144bin_eeze_eeze_scanner_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
145bin_eeze_eeze_scanner_LDADD = $(EEZE_COMMON_USER_LDADD)
146endif
147
148setuid_root_mode = a=rx,u+xs
149install-data-hook::
150 @chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/eeze_scanner$(EXEEXT) || true
151
152
153### Unit tests
154
155if EFL_ENABLE_TESTS
156
157check_PROGRAMS += tests/eeze/eeze_suite
158
159tests_eeze_eeze_suite_SOURCES = tests/eeze/eeze_suite.c
160tests_eeze_eeze_suite_CPPFLAGS = \
161-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \
162$(EEZE_COMMON_CPPFLAGS) \
163@CHECK_CFLAGS@
164tests_eeze_eeze_suite_LDADD = $(EEZE_COMMON_USER_LDADD) @CHECK_LIBS@
165
166endif
diff --git a/legacy/eeze/src/bin/eeze_disk_ls.c b/src/bin/eeze/eeze_disk_ls.c
index 46c4006ce6..46c4006ce6 100644
--- a/legacy/eeze/src/bin/eeze_disk_ls.c
+++ b/src/bin/eeze/eeze_disk_ls.c
diff --git a/legacy/eeze/src/bin/eeze_mount.c b/src/bin/eeze/eeze_mount.c
index 1f1c561458..1f1c561458 100644
--- a/legacy/eeze/src/bin/eeze_mount.c
+++ b/src/bin/eeze/eeze_mount.c
diff --git a/legacy/eeze/src/bin/eeze_scanner.c b/src/bin/eeze/eeze_scanner.c
index 2acd736f41..d7dda1587c 100644
--- a/legacy/eeze/src/bin/eeze_scanner.c
+++ b/src/bin/eeze/eeze_scanner.c
@@ -61,7 +61,7 @@ event_write(const void *data, size_t size, Ecore_Con_Client *cl)
61} 61}
62 62
63static Eina_Bool 63static Eina_Bool
64disk_mount(void *data __UNUSED__, int type __UNUSED__, Eeze_Disk *disk) 64disk_mount(void *data EINA_UNUSED, int type EINA_UNUSED, Eeze_Disk *disk)
65{ 65{
66 Eina_List *l; 66 Eina_List *l;
67 Eeze_Scanner_Device *d; 67 Eeze_Scanner_Device *d;
@@ -79,7 +79,7 @@ disk_mount(void *data __UNUSED__, int type __UNUSED__, Eeze_Disk *disk)
79} 79}
80 80
81static void 81static void
82cl_setup(Ecore_Con_Client *cl __UNUSED__, Eet_Connection *ec) 82cl_setup(Ecore_Con_Client *cl EINA_UNUSED, Eet_Connection *ec)
83{ 83{
84 Eina_List *l; 84 Eina_List *l;
85 Eeze_Scanner_Device *dev; 85 Eeze_Scanner_Device *dev;
@@ -118,13 +118,13 @@ cl_setup(Ecore_Con_Client *cl __UNUSED__, Eet_Connection *ec)
118} 118}
119 119
120static Eina_Bool 120static Eina_Bool
121es_read(const void *eet_data __UNUSED__, size_t size __UNUSED__, void *user_data __UNUSED__) 121es_read(const void *eet_data EINA_UNUSED, size_t size EINA_UNUSED, void *user_data EINA_UNUSED)
122{ 122{
123 return EINA_TRUE; 123 return EINA_TRUE;
124} 124}
125 125
126static Eina_Bool 126static Eina_Bool
127cl_add(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Client_Add *ev) 127cl_add(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Client_Add *ev)
128{ 128{
129 Eet_Connection *ec; 129 Eet_Connection *ec;
130 INF("Added client"); 130 INF("Added client");
@@ -143,7 +143,7 @@ cl_add(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Client_Add *e
143} 143}
144 144
145static Eina_Bool 145static Eina_Bool
146cl_del(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Client_Del *ev) 146cl_del(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Client_Del *ev)
147{ 147{
148 Eet_Connection *ec; 148 Eet_Connection *ec;
149 Eina_Bool d; 149 Eina_Bool d;
@@ -288,7 +288,7 @@ storage_setup(void)
288} 288}
289 289
290static void 290static void
291cb_vol_chg(const char *device, Eeze_Udev_Event ev, void *data __UNUSED__, Eeze_Udev_Watch *watch __UNUSED__) 291cb_vol_chg(const char *device, Eeze_Udev_Event ev, void *data EINA_UNUSED, Eeze_Udev_Watch *watch EINA_UNUSED)
292{ 292{
293 Eina_List *l; 293 Eina_List *l;
294 Eeze_Scanner_Device *dev; 294 Eeze_Scanner_Device *dev;
@@ -331,7 +331,7 @@ cb_vol_chg(const char *device, Eeze_Udev_Event ev, void *data __UNUSED__, Eeze_U
331} 331}
332 332
333static void 333static void
334cb_stor_chg(const char *device, Eeze_Udev_Event ev, void *data __UNUSED__, Eeze_Udev_Watch *watch __UNUSED__) 334cb_stor_chg(const char *device, Eeze_Udev_Event ev, void *data EINA_UNUSED, Eeze_Udev_Watch *watch EINA_UNUSED)
335{ 335{
336 Eina_List *l; 336 Eina_List *l;
337 Eeze_Scanner_Device *dev = NULL; 337 Eeze_Scanner_Device *dev = NULL;
diff --git a/legacy/eeze/src/bin/eeze_scanner.h b/src/bin/eeze/eeze_scanner.h
index a9757931af..a9757931af 100644
--- a/legacy/eeze/src/bin/eeze_scanner.h
+++ b/src/bin/eeze/eeze_scanner.h
diff --git a/legacy/eeze/src/bin/eeze_sensor_test.c b/src/bin/eeze/eeze_sensor_test.c
index 2c7387691e..2c7387691e 100644
--- a/legacy/eeze/src/bin/eeze_sensor_test.c
+++ b/src/bin/eeze/eeze_sensor_test.c
diff --git a/legacy/eeze/src/bin/eeze_udev_test.c b/src/bin/eeze/eeze_udev_test.c
index 130771a3c4..130771a3c4 100644
--- a/legacy/eeze/src/bin/eeze_udev_test.c
+++ b/src/bin/eeze/eeze_udev_test.c
diff --git a/legacy/eeze/src/bin/eeze_umount.c b/src/bin/eeze/eeze_umount.c
index 75d5ebbf31..75d5ebbf31 100644
--- a/legacy/eeze/src/bin/eeze_umount.c
+++ b/src/bin/eeze/eeze_umount.c
diff --git a/legacy/eeze/src/lib/Eeze.h b/src/lib/eeze/Eeze.h
index 9103493d13..82ef11ae82 100644
--- a/legacy/eeze/src/lib/Eeze.h
+++ b/src/lib/eeze/Eeze.h
@@ -1,39 +1,73 @@
1/** 1/**
2 @brief Eeze Device Library 2
3 * 3 @brief Eeze Device Library
4 @mainpage Eeze 4
5 @image html eeze.png 5 @page eeze_main Eeze
6 @version 1.7.0 6
7 @author Mike Blumenkrantz (zmike/discomfitor) <michael.blumenkrantz@@gmail.com> 7 @date 2010 (created)
8 @date 2010-2012 8
9 9 @section toc Table of Contents
10 @section intro What is Eeze? 10
11 11 @li @ref eeze_main_intro
12 Eeze is a library for manipulating devices through udev with a simple and fast 12 @li @ref eeze_main_compiling
13 api. It interfaces directly with libudev, avoiding such middleman daemons as 13 @li @ref eeze_main_next_steps
14 udisks/upower or hal, to immediately gather device information the instant it 14
15 becomes known to the system. This can be used to determine such things as: 15 @section eeze_main_intro Introduction
16 @li If a cdrom has a disk inserted 16
17 @li The temperature of a cpu core 17 Eeze is a library for manipulating devices through udev with a
18 @li The remaining power left in a battery 18 simple and fast api. It interfaces directly with libudev, avoiding
19 @li The current power consumption of various parts 19 such middleman daemons as udisks/upower or hal, to immediately
20 @li Monitor in realtime the status of peripheral devices 20 gather device information the instant it becomes known to the
21 21 system. This can be used to determine such things as:
22 Each of the above examples can be performed by using only a single eeze 22
23 function, as one of the primary focuses of the library is to reduce the 23 @li If a cdrom has a disk inserted
24 complexity of managing devices. 24 @li The temperature of a cpu core
25 25 @li The remaining power left in a battery
26 @li @link Eeze.h Eeze functions @endlink 26 @li The current power consumption of various parts
27 @li @ref udev UDEV functions 27 @li Monitor in realtime the status of peripheral devices
28 @li @ref watch Functions that watch for events 28
29 @li @ref syspath Functions that accept a device /sys/ path 29 Each of the above examples can be performed by using only a single eeze
30 @li @ref find Functions which find types of devices 30 function, as one of the primary focuses of the library is to reduce the
31 @li @ref disk Disk functions 31 complexity of managing devices.
32 @li @ref net Net functions 32
33 @li @ref sensor Sensor functions 33 @section eeze_main_compiling How to compile
34 @verbatim 34
35 Pants 35 Eeze is a library your application links to. The procedure for this is very
36 @endverbatim 36 simple. You simply have to compile your application with the appropriate
37 compiler flags that the @p pkg-config script outputs. For example:
38
39 Compiling C or C++ files into object files:
40
41 @verbatim
42 gcc -c -o main.o main.c `pkg-config --cflags eeze`
43 @endverbatim
44
45 Linking object files into a binary executable:
46
47 @verbatim
48 gcc -o my_application main.o `pkg-config --libs eeze`
49 @endverbatim
50
51 See @ref pkgconfig
52
53 @section eeze_main_next_steps Next Steps
54
55 After you understood what Eeze is and installed it in your system
56 you should proceed understanding the programming interface. We'd
57 recommend you to take a while to learn @ref Eina and @ref Ecore as
58 they convenient and Eeze provides integration with it.
59
60 Recommended reading:
61
62 @li @link Eeze.h Eeze functions @endlink
63 @li @ref Eeze_Udev UDEV functions
64 @li @ref Eeze_Watch Functions that watch for events
65 @li @ref Eeze_Syspath Functions that accept a device /sys/ path
66 @li @ref Eeze_Find Functions which find types of devices
67 @li @ref Eeze_Disk Disk functions
68 @li @ref Eeze_Net Net functions
69 @li @ref Eeze_Sensor Sensor functions
70
37 */ 71 */
38#ifndef EEZE_UDEV_H 72#ifndef EEZE_UDEV_H
39#define EEZE_UDEV_H 73#define EEZE_UDEV_H
@@ -76,19 +110,21 @@
76 */ 110 */
77 111
78/** 112/**
79 * @defgroup main main 113 * @defgroup Eeze_Main main
114 * @ingroup Eeze
80 * 115 *
81 * These are general eeze functions which include init and shutdown. 116 * These are general eeze functions which include init and shutdown.
82 */ 117 */
83 118
84/** 119/**
85 * @defgroup udev udev 120 * @defgroup Eeze_Udev udev
121 * @ingroup Eeze_Main
86 * 122 *
87 * These are functions which interact directly with udev. 123 * These are functions which interact directly with udev.
88 */ 124 */
89 125
90/** 126/**
91 * @addtogroup udev 127 * @addtogroup Eeze_Udev
92 * 128 *
93 * These are the device subsystems of udev: 129 * These are the device subsystems of udev:
94 * @li ac97 130 * @li ac97
@@ -150,7 +186,7 @@ extern "C" {
150#endif 186#endif
151 187
152/** 188/**
153 * @addtogroup udev 189 * @addtogroup Eeze_Udev
154 * @typedef Eeze_Udev_Event 190 * @typedef Eeze_Udev_Event
155 * @enum Eeze_Udev_Event 191 * @enum Eeze_Udev_Event
156 * @brief Flags for watch events 192 * @brief Flags for watch events
@@ -177,7 +213,7 @@ typedef enum
177/** @} */ 213/** @} */
178 214
179/** 215/**
180 * @addtogroup udev udev 216 * @addtogroup Eeze_Udev udev
181 * @typedef Eeze_Udev_Type Eeze_Udev_Type 217 * @typedef Eeze_Udev_Type Eeze_Udev_Type
182 * @enum Eeze_Udev_Type 218 * @enum Eeze_Udev_Type
183 * @brief Convenience types to simplify udev access. 219 * @brief Convenience types to simplify udev access.
@@ -228,7 +264,7 @@ typedef enum
228struct Eeze_Udev_Watch; 264struct Eeze_Udev_Watch;
229 265
230/** 266/**
231 * @addtogroup watch 267 * @addtogroup Eeze_Watch
232 * @typedef Eeze_Udev_Watch Eeze_Udev_Watch 268 * @typedef Eeze_Udev_Watch Eeze_Udev_Watch
233 * @brief Opaque structure to hold data for a udev watch 269 * @brief Opaque structure to hold data for a udev watch
234 */ 270 */
@@ -248,7 +284,7 @@ typedef struct Eeze_Udev_Watch Eeze_Udev_Watch;
248 EAPI extern Eeze_Version *eeze_version; 284 EAPI extern Eeze_Version *eeze_version;
249 285
250/** 286/**
251 * @addtogroup watch 287 * @addtogroup Eeze_Watch
252 * @typedef Eeze_Udev_Watch_Cb Eeze_Udev_Watch_Cb 288 * @typedef Eeze_Udev_Watch_Cb Eeze_Udev_Watch_Cb
253 * @brief Callback type for use with #Eeze_Udev_Watch 289 * @brief Callback type for use with #Eeze_Udev_Watch
254 */ 290 */
@@ -262,7 +298,7 @@ typedef void(*Eeze_Udev_Watch_Cb)(const char *, Eeze_Udev_Event, void *, Eeze_Ud
262 * This function should be called prior to using any eeze functions, and MUST 298 * This function should be called prior to using any eeze functions, and MUST
263 * be called prior to using any udev functions to avoid a segv. 299 * be called prior to using any udev functions to avoid a segv.
264 * 300 *
265 * @ingroup main 301 * @ingroup Eeze_Main
266 */ 302 */
267EAPI int eeze_init(void); 303EAPI int eeze_init(void);
268 304
@@ -273,16 +309,16 @@ EAPI int eeze_init(void);
273 * 309 *
274 * This function should be called when no further eeze functions will be called. 310 * This function should be called when no further eeze functions will be called.
275 * 311 *
276 * @ingroup main 312 * @ingroup Eeze_Main
277 */ 313 */
278EAPI int eeze_shutdown(void); 314EAPI int eeze_shutdown(void);
279 315
280 /** 316 /**
281 * @addtogroup find Find 317 * @addtogroup Eeze_Find Find
282 * 318 *
283 * These are functions which find/supplement lists of devices. 319 * These are functions which find/supplement lists of devices.
284 * 320 *
285 * @ingroup udev 321 * @ingroup Eeze_Udev
286 * 322 *
287 * @{ 323 * @{
288 */ 324 */
@@ -319,7 +355,7 @@ EAPI Eina_List *eeze_udev_find_unlisted_similar(Eina_List *list);
319 * 355 *
320 * @return A stringshared list of the devices found with the attribute 356 * @return A stringshared list of the devices found with the attribute
321 * 357 *
322 * @ingroup find 358 * @ingroup Eeze_Find
323 */ 359 */
324EAPI Eina_List *eeze_udev_find_by_sysattr(const char *sysattr, const char *value); 360EAPI Eina_List *eeze_udev_find_by_sysattr(const char *sysattr, const char *value);
325 361
@@ -351,12 +387,12 @@ EAPI Eina_List *eeze_udev_find_by_filter(const char *subsystem, const char
351 */ 387 */
352 388
353 /** 389 /**
354 * @addtogroup syspath Syspath 390 * @addtogroup Eeze_Syspath Syspath
355 * 391 *
356 * These are functions which interact with the syspath (/sys/$PATH) of 392 * These are functions which interact with the syspath (/sys/$PATH) of
357 * a device. 393 * a device.
358 * 394 *
359 * @ingroup udev 395 * @ingroup Eeze_Udev
360 * 396 *
361 * @{ 397 * @{
362 */ 398 */
@@ -475,11 +511,11 @@ EAPI Eina_Bool eeze_udev_syspath_is_joystick(const char *syspath);
475 */ 511 */
476 512
477 /** 513 /**
478 * @addtogroup walks Walks 514 * @addtogroup Eeze_Walks Walks
479 * 515 *
480 * These are functions which walk up the device chain. 516 * These are functions which walk up the device chain.
481 * 517 *
482 * @ingroup udev 518 * @ingroup Eeze_Udev
483 * 519 *
484 * @{ 520 * @{
485 */ 521 */
@@ -511,7 +547,7 @@ EAPI const char *eeze_udev_walk_get_sysattr(const char *syspath, const char
511 */ 547 */
512 548
513 /** 549 /**
514 * @addtogroup watch Watch 550 * @addtogroup Eeze_Watch Watch
515 * 551 *
516 * @brief These are functions which monitor udev for events. 552 * @brief These are functions which monitor udev for events.
517 * 553 *
@@ -520,7 +556,7 @@ EAPI const char *eeze_udev_walk_get_sysattr(const char *syspath, const char
520 * syspath of the triggering device and the event that happened to the device, along with the data you associated with the watch and 556 * syspath of the triggering device and the event that happened to the device, along with the data you associated with the watch and
521 * the watch object itself in case you want to stop the watch easily in a callback. 557 * the watch object itself in case you want to stop the watch easily in a callback.
522 * 558 *
523 * @ingroup udev 559 * @ingroup Eeze_Udev
524 * 560 *
525 * @{ 561 * @{
526 */ 562 */
diff --git a/legacy/eeze/src/lib/Eeze_Disk.h b/src/lib/eeze/Eeze_Disk.h
index 36079b34de..ca131d3f51 100644
--- a/legacy/eeze/src/lib/Eeze_Disk.h
+++ b/src/lib/eeze/Eeze_Disk.h
@@ -26,7 +26,11 @@
26 * Eeze disk functions allow you to quickly and efficiently manipulate disks 26 * Eeze disk functions allow you to quickly and efficiently manipulate disks
27 * through simple function calls. 27 * through simple function calls.
28 * 28 *
29 * @addtogroup disk Disk 29 * @defgroup Eeze_Disk Disk
30 * Scan and query information about disks. Manipulate them with moun,
31 * unmount and eject.
32 *
33 * @ingroup Eeze
30 * @{ 34 * @{
31 */ 35 */
32 36
diff --git a/legacy/eeze/src/lib/Eeze_Net.h b/src/lib/eeze/Eeze_Net.h
index 97a17ca00a..aa58deb8d4 100644
--- a/legacy/eeze/src/lib/Eeze_Net.h
+++ b/src/lib/eeze/Eeze_Net.h
@@ -24,7 +24,10 @@
24 * 24 *
25 * Eeze net functions allow you to gather information about network objects 25 * Eeze net functions allow you to gather information about network objects
26 * 26 *
27 * @addtogroup net Net 27 * @defgroup Eeze_Net Net
28 * Gather information about network devices.
29 *
30 * @ingroup Eeze
28 * @{ 31 * @{
29 */ 32 */
30 33
diff --git a/legacy/eeze/src/lib/Eeze_Sensor.h b/src/lib/eeze/Eeze_Sensor.h
index 0f53f0b601..02a51fe385 100644
--- a/legacy/eeze/src/lib/Eeze_Sensor.h
+++ b/src/lib/eeze/Eeze_Sensor.h
@@ -43,7 +43,11 @@
43 * 43 *
44 * @since 1.8 44 * @since 1.8
45 * 45 *
46 * @addtogroup sensor Sensor 46 * @addtogroup Eeze_Sensor Sensor
47 * Gather sensor information from different sources. Works based on plugins,
48 * with a Tizen plugin being available.
49 *
50 * @ingroup Eeze
47 * @{ 51 * @{
48 */ 52 */
49 53
@@ -78,8 +82,9 @@ typedef enum
78} Eeze_Sensor_Type; 82} Eeze_Sensor_Type;
79 83
80/** 84/**
81 * @defgroup Sensor_Events Available eeze sensor events 85 * @defgroup Eeze_Sensor_Events Available eeze sensor events
82 * @brief Sensor events that are emitted from the library as ecore events 86 * @brief Sensor events that are emitted from the library as ecore events
87 * @ingroup Eeze
83 * 88 *
84 * Event types used to register ecore_event_handler on. These events are used 89 * Event types used to register ecore_event_handler on. These events are used
85 * for #eeze_sensor_async_read to deliver read out data. It is also used for 90 * for #eeze_sensor_async_read to deliver read out data. It is also used for
diff --git a/legacy/eeze/src/lib/eeze_disk.c b/src/lib/eeze/eeze_disk.c
index 8d1aeec52d..80b0c31437 100644
--- a/legacy/eeze/src/lib/eeze_disk.c
+++ b/src/lib/eeze/eeze_disk.c
@@ -5,6 +5,7 @@
5#include <Ecore.h> 5#include <Ecore.h>
6#include <Eeze.h> 6#include <Eeze.h>
7#include <Eeze_Disk.h> 7#include <Eeze_Disk.h>
8#include <unistd.h>
8 9
9#include "eeze_udev_private.h" 10#include "eeze_udev_private.h"
10#include "eeze_disk_private.h" 11#include "eeze_disk_private.h"
@@ -460,17 +461,23 @@ eeze_disk_removable_get(Eeze_Disk *disk)
460EAPI Eina_Bool 461EAPI Eina_Bool
461eeze_disk_can_mount(void) 462eeze_disk_can_mount(void)
462{ 463{
463 return MOUNTABLE; 464 if (sizeof(EEZE_MOUNT_BIN) == sizeof(""))
465 return EINA_FALSE;
466 return access(EEZE_MOUNT_BIN, X_OK | R_OK) == 0;
464} 467}
465 468
466EAPI Eina_Bool 469EAPI Eina_Bool
467eeze_disk_can_unmount(void) 470eeze_disk_can_unmount(void)
468{ 471{
469 return UNMOUNTABLE; 472 if (sizeof(EEZE_UNMOUNT_BIN) == sizeof(""))
473 return EINA_FALSE;
474 return access(EEZE_UNMOUNT_BIN, X_OK | R_OK) == 0;
470} 475}
471 476
472EAPI Eina_Bool 477EAPI Eina_Bool
473eeze_disk_can_eject(void) 478eeze_disk_can_eject(void)
474{ 479{
475 return EJECTABLE; 480 if (sizeof(EEZE_EJECT_BIN) == sizeof(""))
481 return EINA_FALSE;
482 return access(EEZE_EJECT_BIN, X_OK | R_OK) == 0;
476} 483}
diff --git a/legacy/eeze/src/lib/eeze_disk_libmount.c b/src/lib/eeze/eeze_disk_libmount.c
index 885f313cc0..9cc1980bb2 100644
--- a/legacy/eeze/src/lib/eeze_disk_libmount.c
+++ b/src/lib/eeze/eeze_disk_libmount.c
@@ -50,7 +50,7 @@ static libmnt_lock *_eeze_mtab_lock = NULL;
50extern Eina_List *_eeze_disks; 50extern Eina_List *_eeze_disks;
51 51
52static libmnt_table *_eeze_mount_tab_parse(const char *filename); 52static libmnt_table *_eeze_mount_tab_parse(const char *filename);
53static void _eeze_mount_tab_watcher(void *data, Ecore_File_Monitor *mon __UNUSED__, Ecore_File_Event event __UNUSED__, const char *path); 53static void _eeze_mount_tab_watcher(void *data, Ecore_File_Monitor *mon EINA_UNUSED, Ecore_File_Event event EINA_UNUSED, const char *path);
54 54
55static Eina_Bool 55static Eina_Bool
56_eeze_mount_lock_mtab(void) 56_eeze_mount_lock_mtab(void)
@@ -80,7 +80,7 @@ _eeze_mount_unlock_mtab(void)
80 80
81 81
82static int 82static int
83_eeze_mount_tab_parse_errcb(libmnt_table *tab __UNUSED__, const char *filename, int line) 83_eeze_mount_tab_parse_errcb(libmnt_table *tab EINA_UNUSED, const char *filename, int line)
84{ 84{
85 ERR("%s:%d: could not parse line!", filename, line); /* most worthless error reporting ever. */ 85 ERR("%s:%d: could not parse line!", filename, line); /* most worthless error reporting ever. */
86 return -1; 86 return -1;
@@ -111,7 +111,7 @@ _eeze_mount_tab_parse(const char *filename)
111} 111}
112 112
113static void 113static void
114_eeze_mount_tab_watcher(void *data, Ecore_File_Monitor *mon __UNUSED__, Ecore_File_Event event __UNUSED__, const char *path) 114_eeze_mount_tab_watcher(void *data, Ecore_File_Monitor *mon EINA_UNUSED, Ecore_File_Event event EINA_UNUSED, const char *path)
115{ 115{
116 libmnt_table *bak; 116 libmnt_table *bak;
117 117
diff --git a/legacy/eeze/src/lib/eeze_disk_libmount_new.c b/src/lib/eeze/eeze_disk_libmount_new.c
index 58115189cc..aaae525b68 100644
--- a/legacy/eeze/src/lib/eeze_disk_libmount_new.c
+++ b/src/lib/eeze/eeze_disk_libmount_new.c
@@ -51,10 +51,10 @@ static Ecore_Fd_Handler *_mountinfo_fdh = NULL;
51static int _mountinfo = -1; 51static int _mountinfo = -1;
52 52
53static libmnt_table *_eeze_mount_tab_parse(const char *filename); 53static libmnt_table *_eeze_mount_tab_parse(const char *filename);
54static void _eeze_mount_tab_watcher(void *data, Ecore_File_Monitor *mon __UNUSED__, Ecore_File_Event event __UNUSED__, const char *path); 54static void _eeze_mount_tab_watcher(void *data, Ecore_File_Monitor *mon EINA_UNUSED, Ecore_File_Event event EINA_UNUSED, const char *path);
55 55
56static int 56static int
57_eeze_mount_tab_parse_errcb(libmnt_table *tab __UNUSED__, const char *filename, int line) 57_eeze_mount_tab_parse_errcb(libmnt_table *tab EINA_UNUSED, const char *filename, int line)
58{ 58{
59 ERR("%s:%d: could not parse line!", filename, line); /* most worthless error reporting ever. */ 59 ERR("%s:%d: could not parse line!", filename, line); /* most worthless error reporting ever. */
60 return -1; 60 return -1;
@@ -85,7 +85,7 @@ _eeze_mount_tab_parse(const char *filename)
85} 85}
86 86
87static void 87static void
88_eeze_mount_tab_watcher(void *data, Ecore_File_Monitor *mon __UNUSED__, Ecore_File_Event event __UNUSED__, const char *path) 88_eeze_mount_tab_watcher(void *data, Ecore_File_Monitor *mon EINA_UNUSED, Ecore_File_Event event EINA_UNUSED, const char *path)
89{ 89{
90 libmnt_table *bak; 90 libmnt_table *bak;
91 91
@@ -125,7 +125,7 @@ error:
125 * based on code from findmnt 125 * based on code from findmnt
126 */ 126 */
127static Eina_Bool 127static Eina_Bool
128_eeze_mount_fdh(void *d __UNUSED__, Ecore_Fd_Handler *fdh __UNUSED__) 128_eeze_mount_fdh(void *d EINA_UNUSED, Ecore_Fd_Handler *fdh EINA_UNUSED)
129{ 129{
130 libmnt_table *tb_new; 130 libmnt_table *tb_new;
131 libmnt_fs *old, *new; 131 libmnt_fs *old, *new;
diff --git a/legacy/eeze/src/lib/eeze_disk_mount.c b/src/lib/eeze/eeze_disk_mount.c
index 24c0ae4ebb..bfbf8f0781 100644
--- a/legacy/eeze/src/lib/eeze_disk_mount.c
+++ b/src/lib/eeze/eeze_disk_mount.c
@@ -30,7 +30,7 @@ Eina_List *eeze_events = NULL;
30 */ 30 */
31 31
32static void 32static void
33_eeze_disk_mount_error_free(void *data __UNUSED__, Eeze_Event_Disk_Error *de) 33_eeze_disk_mount_error_free(void *data EINA_UNUSED, Eeze_Event_Disk_Error *de)
34{ 34{
35 if (!de) 35 if (!de)
36 return; 36 return;
@@ -55,7 +55,7 @@ _eeze_disk_mount_error_handler(Eeze_Disk *disk, const char *error)
55} 55}
56 56
57static Eina_Bool 57static Eina_Bool
58_eeze_disk_mount_result_handler(void *data __UNUSED__, int type __UNUSED__, Ecore_Exe_Event_Del *ev) 58_eeze_disk_mount_result_handler(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Exe_Event_Del *ev)
59{ 59{
60 Eeze_Disk *disk; 60 Eeze_Disk *disk;
61 Eina_List *l; 61 Eina_List *l;
@@ -221,10 +221,6 @@ EAPI unsigned long
221eeze_disk_mountopts_get(Eeze_Disk *disk) 221eeze_disk_mountopts_get(Eeze_Disk *disk)
222{ 222{
223 EINA_SAFETY_ON_NULL_RETURN_VAL(disk, 0); 223 EINA_SAFETY_ON_NULL_RETURN_VAL(disk, 0);
224#ifndef OLD_LIBMOUNT
225 if (!disk->mount_opts)
226 disk->mount_opts = eeze_disk_libmount_opts_get(disk);
227#endif
228 return disk->mount_opts; 224 return disk->mount_opts;
229} 225}
230 226
diff --git a/legacy/eeze/src/lib/eeze_disk_private.h b/src/lib/eeze/eeze_disk_private.h
index 0174b9e30d..0174b9e30d 100644
--- a/legacy/eeze/src/lib/eeze_disk_private.h
+++ b/src/lib/eeze/eeze_disk_private.h
diff --git a/legacy/eeze/src/lib/eeze_disk_udev.c b/src/lib/eeze/eeze_disk_udev.c
index ef7b16029e..ef7b16029e 100644
--- a/legacy/eeze/src/lib/eeze_disk_udev.c
+++ b/src/lib/eeze/eeze_disk_udev.c
diff --git a/legacy/eeze/src/lib/eeze_main.c b/src/lib/eeze/eeze_main.c
index e2b878b20b..1b2bfc2571 100644
--- a/legacy/eeze/src/lib/eeze_main.c
+++ b/src/lib/eeze/eeze_main.c
@@ -14,7 +14,7 @@ _udev *udev;
14 14
15int _eeze_udev_log_dom = -1; 15int _eeze_udev_log_dom = -1;
16int _eeze_net_log_dom = -1; 16int _eeze_net_log_dom = -1;
17int _eeze_sensor_log_dom = -1; 17EAPI int _eeze_sensor_log_dom = -1;
18int _eeze_init_count = 0; 18int _eeze_init_count = 0;
19 19
20static Eeze_Version _version = { VMAJ, VMIN, VMIC, VREV }; 20static Eeze_Version _version = { VMAJ, VMIN, VMIC, VREV };
diff --git a/legacy/eeze/src/lib/eeze_net.c b/src/lib/eeze/eeze_net.c
index 415f79413d..8a8826421d 100644
--- a/legacy/eeze/src/lib/eeze_net.c
+++ b/src/lib/eeze/eeze_net.c
@@ -27,7 +27,9 @@ eeze_net_shutdown(void)
27 eeze_nets = NULL; 27 eeze_nets = NULL;
28} 28}
29 29
30/** @addtogroup net Net 30/**
31 * @addtogroup Eeze_Net Net
32 * @ingroup Eeze
31 * @{ 33 * @{
32 */ 34 */
33 35
diff --git a/legacy/eeze/src/lib/eeze_net_private.h b/src/lib/eeze/eeze_net_private.h
index d9b8faf115..d9b8faf115 100644
--- a/legacy/eeze/src/lib/eeze_net_private.h
+++ b/src/lib/eeze/eeze_net_private.h
diff --git a/legacy/eeze/src/lib/eeze_sensor.c b/src/lib/eeze/eeze_sensor.c
index 024f206b62..b808c6cc50 100644
--- a/legacy/eeze/src/lib/eeze_sensor.c
+++ b/src/lib/eeze/eeze_sensor.c
@@ -80,7 +80,7 @@ eeze_sensor_modules_load(void)
80 if (getenv("EEZE_USE_IN_TREE_MODULES")) 80 if (getenv("EEZE_USE_IN_TREE_MODULES"))
81 g_handle->modules_array = eina_module_list_get(NULL, PACKAGE_BUILD_DIR "/src/modules/.libs/", 0, NULL, NULL); 81 g_handle->modules_array = eina_module_list_get(NULL, PACKAGE_BUILD_DIR "/src/modules/.libs/", 0, NULL, NULL);
82 else 82 else
83 g_handle->modules_array = eina_module_list_get(NULL, PACKAGE_LIB_DIR "/eeze-sensor/", 0, NULL, NULL); 83 g_handle->modules_array = eina_module_list_get(NULL, PACKAGE_LIB_DIR "/eeze/sensor/", 0, NULL, NULL);
84 84
85 if (!g_handle->modules_array) 85 if (!g_handle->modules_array)
86 { 86 {
diff --git a/legacy/eeze/src/lib/eeze_sensor_private.h b/src/lib/eeze/eeze_sensor_private.h
index 88c45e2367..aa39f94a37 100644
--- a/legacy/eeze/src/lib/eeze_sensor_private.h
+++ b/src/lib/eeze/eeze_sensor_private.h
@@ -74,7 +74,7 @@ typedef struct _Eeze_Sensor_Module
74 * 74 *
75 * @since 1.8 75 * @since 1.8
76 */ 76 */
77Eina_Bool eeze_sensor_module_register(const char *name, Eeze_Sensor_Module *mod); 77EAPI Eina_Bool eeze_sensor_module_register(const char *name, Eeze_Sensor_Module *mod);
78 78
79/** 79/**
80 * @brief Unregister a module from eeze_sensor core. 80 * @brief Unregister a module from eeze_sensor core.
@@ -85,5 +85,5 @@ Eina_Bool eeze_sensor_module_register(const char *name, Eeze_Sensor_Module *mod)
85 * 85 *
86 * @since 1.8 86 * @since 1.8
87 */ 87 */
88Eina_Bool eeze_sensor_module_unregister(const char *name); 88EAPI Eina_Bool eeze_sensor_module_unregister(const char *name);
89#endif // EEZE_SENSOR_PRIVATE_H 89#endif // EEZE_SENSOR_PRIVATE_H
diff --git a/legacy/eeze/src/lib/eeze_udev_find.c b/src/lib/eeze/eeze_udev_find.c
index 3bd06ab5cf..3bd06ab5cf 100644
--- a/legacy/eeze/src/lib/eeze_udev_find.c
+++ b/src/lib/eeze/eeze_udev_find.c
diff --git a/legacy/eeze/src/lib/eeze_udev_private.c b/src/lib/eeze/eeze_udev_private.c
index 7e5b5dd8a4..7e5b5dd8a4 100644
--- a/legacy/eeze/src/lib/eeze_udev_private.c
+++ b/src/lib/eeze/eeze_udev_private.c
diff --git a/legacy/eeze/src/lib/eeze_udev_private.h b/src/lib/eeze/eeze_udev_private.h
index 59aacbdebf..59aacbdebf 100644
--- a/legacy/eeze/src/lib/eeze_udev_private.h
+++ b/src/lib/eeze/eeze_udev_private.h
diff --git a/legacy/eeze/src/lib/eeze_udev_syspath.c b/src/lib/eeze/eeze_udev_syspath.c
index df858e6c1e..df858e6c1e 100644
--- a/legacy/eeze/src/lib/eeze_udev_syspath.c
+++ b/src/lib/eeze/eeze_udev_syspath.c
diff --git a/legacy/eeze/src/lib/eeze_udev_walk.c b/src/lib/eeze/eeze_udev_walk.c
index 78e2aabda4..78e2aabda4 100644
--- a/legacy/eeze/src/lib/eeze_udev_walk.c
+++ b/src/lib/eeze/eeze_udev_walk.c
diff --git a/legacy/eeze/src/lib/eeze_udev_watch.c b/src/lib/eeze/eeze_udev_watch.c
index 0083b818fc..0083b818fc 100644
--- a/legacy/eeze/src/lib/eeze_udev_watch.c
+++ b/src/lib/eeze/eeze_udev_watch.c
diff --git a/legacy/eeze/src/modules/eeze_sensor_fake.c b/src/modules/eeze/eeze_sensor_fake.c
index 2bb10c150f..2bb10c150f 100644
--- a/legacy/eeze/src/modules/eeze_sensor_fake.c
+++ b/src/modules/eeze/eeze_sensor_fake.c
diff --git a/legacy/eeze/src/modules/eeze_sensor_tizen.c b/src/modules/eeze/eeze_sensor_tizen.c
index 55db220a1b..55db220a1b 100644
--- a/legacy/eeze/src/modules/eeze_sensor_tizen.c
+++ b/src/modules/eeze/eeze_sensor_tizen.c
diff --git a/legacy/eeze/src/tests/eeze_suite.c b/src/tests/eeze/eeze_suite.c
index 6ae6e1a7a9..360d34ccd4 100644
--- a/legacy/eeze/src/tests/eeze_suite.c
+++ b/src/tests/eeze/eeze_suite.c
@@ -628,7 +628,7 @@ eeze_suite(void)
628 TCase *tc; 628 TCase *tc;
629 629
630 s = suite_create("Eeze"); 630 s = suite_create("Eeze");
631 631#if 0
632 tc = tcase_create("Eeze_Init"); 632 tc = tcase_create("Eeze_Init");
633 tcase_add_test(tc, eeze_test_init); 633 tcase_add_test(tc, eeze_test_init);
634 suite_add_tcase(s, tc); 634 suite_add_tcase(s, tc);
@@ -651,7 +651,7 @@ eeze_suite(void)
651 //tcase_add_test(tc, eeze_test_net_attr_ipv6); 651 //tcase_add_test(tc, eeze_test_net_attr_ipv6);
652#endif 652#endif
653 suite_add_tcase(s, tc); 653 suite_add_tcase(s, tc);
654 654#endif
655 tc = tcase_create("Eeze Sensor"); 655 tc = tcase_create("Eeze Sensor");
656 tcase_add_test(tc, eeze_test_sensor_read); 656 tcase_add_test(tc, eeze_test_sensor_read);
657 tcase_add_test(tc, eeze_test_sensor_async_read); 657 tcase_add_test(tc, eeze_test_sensor_async_read);