enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

move/rename all files/functions/variables to eeze_udev for proper namespacing 

SVN revision: 48845
This commit is contained in:
Mike Blumenkrantz 2010-05-14 05:21:52 +00:00
parent 308c35adac
commit 90b028d63c
11 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/eeze/Makefile.am
View File

@ -10,10 +10,10 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
pkgconfigdir = $(libdir)/pkgconfig
if BUILD_EUDEV
EUDEV_PC = eudev.pc
if BUILD_EEZE_UDEV
EEZE_UDEV_PC = eeze_udev.pc
endif
pkgconfig_DATA = $(EUDEV_PC)
pkgconfig_DATA = $(EEZE_UDEV_PC)
.PHONY: doc

20
legacy/eeze/configure.ac
View File

@ -25,18 +25,18 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
eudev_release_info="-release $release"
eeze_udev_release_info="-release $release"
AC_SUBST(version_info)
AC_SUBST(eudev_release_info)
AC_SUBST(eeze_udev_release_info)
modules=""
dnl Check enabled modules to build
AC_ARG_ENABLE([eudev],[AC_HELP_STRING([--disable-eudev], [Disable eudev build])])
AC_ARG_ENABLE([eeze_udev],[AC_HELP_STRING([--disable-udev], [Disable eeze_udev build])])
AS_IF(
[test "x$enableval" != "xno"],
modules+="udev"
[enable_eudev="yes"],
[enable_eudev=no],
[enable_eeze_udev="yes"],
[enable_eeze_udev=no],
)
if test -z $modules;then
@ -56,11 +56,11 @@ AC_SUBST(pkgconfig_requires_private)
PKG_CHECK_MODULES([ECORE], [ecore])
AS_IF(
[test "x${enable_eudev}" = "xyes"],
[PKG_CHECK_MODULES(UDEV, libudev, [], [enable_eudev="no"])]
[test "x${enable_eeze_udev}" = "xyes"],
[PKG_CHECK_MODULES(UDEV, libudev, [], [enable_eeze_udev="no"])]
)
AM_CONDITIONAL([BUILD_EUDEV], [test "x${enable_eudev}" = "xyes"])
AM_CONDITIONAL([BUILD_EEZE_UDEV], [test "x${enable_eeze_udev}" = "xyes"])
EFL_EDBUS_BUILD=""
lt_enable_auto_import=""
@ -80,7 +80,7 @@ src/Makefile
src/lib/Makefile
src/lib/udev/Makefile
src/bin/Makefile
eudev.pc
eeze_udev.pc
])
@ -98,7 +98,7 @@ echo "Configuration Options Summary:"
echo
echo " Modules:"
echo
echo " EUdev..............: $enable_eudev"
echo " Eeze_Udev..............: $enable_eeze_udev"
echo
echo "Compilation............: make (or gmake)"
echo " CPPFLAGS.............: $CPPFLAGS"

4
legacy/eeze/eudev.pc.in → legacy/eeze/eeze_udev.pc.in
View File

@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: eudev
Name: eeze_udev
Description: udev convenience library for efl
@pkgconfig_requires_private@: ecore libudev
Version: @VERSION@
Libs: -L${libdir} -leudev
Libs: -L${libdir} -leeze_udev
Cflags: -I${includedir}

10
legacy/eeze/src/bin/Makefile.am
View File

@ -7,15 +7,15 @@ EEZE_CPPFLAGS = \
LIBS = \
@ECORE_LIBS@
if BUILD_EUDEV
EUDEV_PROG = eeze_udev_test
if BUILD_EEZE_UDEV
EEZE_UDEV_PROG = eeze_udev_test
endif
bin_PROGRAMS = \
$(EUDEV_PROG)
$(EEZE_UDEV_PROG)
if BUILD_EUDEV
if BUILD_EEZE_UDEV
eeze_udev_test_SOURCES = eeze_udev_test.c
eeze_udev_test_CPPFLAGS = $(EEZE_CPPFLAGS)
eeze_udev_test_LDADD = $(top_builddir)/src/lib/udev/libeudev.la
eeze_udev_test_LDADD = $(top_builddir)/src/lib/udev/libeeze_udev.la
endif

42
legacy/eeze/src/bin/eeze_udev_test.c
View File

@ -1,4 +1,4 @@
#include <E_Udev.h>
#include <Eeze_Udev.h>
#include <Ecore.h>
#include <stdio.h>
@ -28,7 +28,7 @@ catch_events(const char *device, const char *event, void *data, Eudev_Watch *wat
if (strstr(device, name)) goto end;
/* check to see if the device was just plugged in */
if (e_udev_syspath_is_kbd(device) || e_udev_syspath_is_mouse(device))
if (eeze_udev_syspath_is_kbd(device) || eeze_udev_syspath_is_mouse(device))
{
new = 1;
goto end;
@ -46,7 +46,7 @@ end:
*/
if (new)
{
dev = e_udev_syspath_get_devpath(device);
dev = eeze_udev_syspath_get_devpath(device);
type = "plugged in";
}
else
@ -66,9 +66,9 @@ end:
/* and quit the main loop */
ecore_main_loop_quit();
/* and delete the watch */
e_udev_watch_del(watch);
eeze_udev_watch_del(watch);
/* and shut down eudev */
e_udev_shutdown();
eeze_udev_shutdown();
}
static void
@ -85,7 +85,7 @@ int main()
Eina_Hash *hash;
ecore_init();
e_udev_init();
eeze_udev_init();
hash = eina_hash_stringshared_new(hash_free);
akbdmouse = malloc(sizeof(kbdmouse));
@ -93,10 +93,10 @@ int main()
printf("For my first trick, I will find all of your keyboards and return their syspaths.\n");
/* find all keyboards using type EUDEV_TYPE_KEYBOARD */
type = e_udev_find_by_type(EUDEV_TYPE_KEYBOARD, NULL);
type = eeze_udev_find_by_type(EUDEV_TYPE_KEYBOARD, NULL);
EINA_LIST_FOREACH(type, l, name)
{ /* add the devpath to the hash for use in the cb later */
eina_hash_direct_add(hash, name, e_udev_syspath_get_devpath(name));
eina_hash_direct_add(hash, name, eeze_udev_syspath_get_devpath(name));
printf("Found keyboard: %s\n", name);
}
/* we save this list for later, because once a device is unplugged it can
@ -107,11 +107,11 @@ int main()
printf("\nNext, I will find all of your mice and print the corresponding manufacturer.\n");
/* find all mice using type EUDEV_TYPE_MOUSE */
type = e_udev_find_by_type(EUDEV_TYPE_MOUSE, NULL);
type = eeze_udev_find_by_type(EUDEV_TYPE_MOUSE, NULL);
EINA_LIST_FOREACH(type, l, name)
{ /* add the devpath to the hash for use in the cb later */
eina_hash_direct_add(hash, name, e_udev_syspath_get_devpath(name)); /* get a property using the device's syspath */
printf("Found mouse %s with vendor: %s\n", name, e_udev_syspath_get_property(name, "ID_VENDOR"));
eina_hash_direct_add(hash, name, eeze_udev_syspath_get_devpath(name)); /* get a property using the device's syspath */
printf("Found mouse %s with vendor: %s\n", name, eeze_udev_syspath_get_property(name, "ID_VENDOR"));
}
/* we save this list for later, because once a device is unplugged it can
* no longer be detected by udev, and any related properties are unusable unless
@ -121,13 +121,13 @@ int main()
printf("\nNow let's try something a little more difficult. Mountable filesystems!\n");
/* find all mountable drives using type EUDEV_TYPE_DRIVE_MOUNTABLE */
type = e_udev_find_by_type(EUDEV_TYPE_DRIVE_MOUNTABLE, NULL);
type = eeze_udev_find_by_type(EUDEV_TYPE_DRIVE_MOUNTABLE, NULL);
EINA_LIST_FOREACH(type, l, name)
{
printf("Found device: %s\n", name); /* get a property using the device's syspath */
printf("\tYou probably know it better as %s\n", e_udev_syspath_get_property(name, "DEVNAME"));
printf("\tIt's formatted as %s", e_udev_syspath_get_property(name, "ID_FS_TYPE"));
check = e_udev_syspath_get_property(name, "FSTAB_DIR");
printf("\tYou probably know it better as %s\n", eeze_udev_syspath_get_property(name, "DEVNAME"));
printf("\tIt's formatted as %s", eeze_udev_syspath_get_property(name, "ID_FS_TYPE"));
check = eeze_udev_syspath_get_property(name, "FSTAB_DIR");
if (check)
printf(", and gets mounted at %s", check);
printf("!\n");
@ -136,17 +136,17 @@ int main()
printf("\nInternal drives, anyone? With serial numbers?\n");
/* find all internal drives using type EUDEV_TYPE_DRIVE_INTERNAL */
type = e_udev_find_by_type(EUDEV_TYPE_DRIVE_INTERNAL, NULL);
type = eeze_udev_find_by_type(EUDEV_TYPE_DRIVE_INTERNAL, NULL);
EINA_LIST_FOREACH(type, l, name) /* get a property using the device's syspath */
printf("%s: %s\n", name, e_udev_syspath_get_property(name, "ID_SERIAL"));
printf("%s: %s\n", name, eeze_udev_syspath_get_property(name, "ID_SERIAL"));
eina_list_free(type);
printf("\nGot any removables? I'm gonna find em!\n");
/* find all removable media using type EUDEV_TYPE_DRIVE_REMOVABLE */
type = e_udev_find_by_type(EUDEV_TYPE_DRIVE_REMOVABLE, NULL);
type = eeze_udev_find_by_type(EUDEV_TYPE_DRIVE_REMOVABLE, NULL);
EINA_LIST_FOREACH(type, l, name) /* get a property using the device's syspath */
printf("\tOoh, a %s attached on your %s bus!\n", e_udev_syspath_get_property(name, "ID_MODEL"),
e_udev_syspath_get_property(name, "ID_BUS"));
printf("\tOoh, a %s attached on your %s bus!\n", eeze_udev_syspath_get_property(name, "ID_MODEL"),
eeze_udev_syspath_get_property(name, "ID_BUS"));
eina_list_free(type);
@ -154,7 +154,7 @@ int main()
* set the events to be sent to callback function catch_events(), and attach
* kbdmouse to the watch as associated data
*/
e_udev_watch_add(EUDEV_TYPE_NONE, catch_events, akbdmouse);
eeze_udev_watch_add(EUDEV_TYPE_NONE, catch_events, akbdmouse);
printf("\nAnd now for something more complicated. Plug or unplug your keyboard or mouse for me.\n");
/* main loop must be started to use ecore fd polling */

34
legacy/eeze/src/lib/udev/E_Udev.h → legacy/eeze/src/lib/udev/Eeze_Udev.h
View File

@ -1,5 +1,5 @@
#ifndef E_UDEV_H
#define E_UDEV_H
#ifndef EEZE_UDEV_H
#define EEZE_UDEV_H
#include <Ecore.h>
@ -109,26 +109,26 @@ typedef struct Eudev_Watch Eudev_Watch;
extern "C" {
#endif
EAPI int e_udev_init(void);
EAPI int e_udev_shutdown(void);
EAPI int eeze_udev_init(void);
EAPI int eeze_udev_shutdown(void);
EAPI Eina_List *e_udev_find_by_type(const Eudev_Type type, const char *name);
EAPI Eina_List *e_udev_find_by_filter(const char *subsystem, const char *type, const char *name);
EAPI Eina_List *eeze_udev_find_by_type(const Eudev_Type type, const char *name);
EAPI Eina_List *eeze_udev_find_by_filter(const char *subsystem, const char *type, const char *name);
EAPI const char *e_udev_syspath_rootdev_get(const char *syspath);
EAPI const char *e_udev_syspath_get_devpath(const char *syspath);
EAPI const char *e_udev_syspath_get_subsystem(const char *syspath);
EAPI const char *e_udev_syspath_get_property(const char *syspath, const char *property);
EAPI const char *eeze_udev_syspath_rootdev_get(const char *syspath);
EAPI const char *eeze_udev_syspath_get_devpath(const char *syspath);
EAPI const char *eeze_udev_syspath_get_subsystem(const char *syspath);
EAPI const char *eeze_udev_syspath_get_property(const char *syspath, const char *property);
EAPI const char *e_udev_devpath_get_syspath(const char *devpath);
EAPI const char *e_udev_devpath_get_subsystem(const char *devpath);
EAPI const char *eeze_udev_devpath_get_syspath(const char *devpath);
EAPI const char *eeze_udev_devpath_get_subsystem(const char *devpath);
EAPI Eina_Bool e_udev_syspath_is_mouse(const char *syspath);
EAPI Eina_Bool e_udev_syspath_is_kbd(const char *syspath);
EAPI Eina_Bool e_udev_syspath_is_touchpad(const char *syspath);
EAPI Eina_Bool eeze_udev_syspath_is_mouse(const char *syspath);
EAPI Eina_Bool eeze_udev_syspath_is_kbd(const char *syspath);
EAPI Eina_Bool eeze_udev_syspath_is_touchpad(const char *syspath);
EAPI Eudev_Watch *e_udev_watch_add(Eudev_Type type, void(*func)(const char *, const char *, void *, Eudev_Watch *), void *user_data);
EAPI void *e_udev_watch_del(Eudev_Watch *watch);
EAPI Eudev_Watch *eeze_udev_watch_add(Eudev_Type type, void(*func)(const char *, const char *, void *, Eudev_Watch *), void *user_data);
EAPI void *eeze_udev_watch_del(Eudev_Watch *watch);
#ifdef __cplusplus
}

22
legacy/eeze/src/lib/udev/Makefile.am
View File

@ -2,20 +2,20 @@ MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = @ECORE_CFLAGS@
if BUILD_EUDEV
if BUILD_EEZE_UDEV
lib_LTLIBRARIES = libeudev.la
include_HEADERS = E_Udev.h
lib_LTLIBRARIES = libeeze_udev.la
include_HEADERS = Eeze_Udev.h
noinst_HEADERS = e_udev_private.h
noinst_HEADERS = eeze_udev_private.h
libeudev_la_SOURCES = \
E_Udev.h \
e_udev.c \
e_udev_watch.c \
e_udev_main.c
libeeze_udev_la_SOURCES = \
Eeze_Udev.h \
eeze_udev.c \
eeze_udev_watch.c \
eeze_udev_main.c
libeudev_la_LIBADD = @ECORE_LIBS@ @UDEV_LIBS@
libeudev_la_LDFLAGS = -no-undefined -version-info @version_info@ @eudev_release_info@
libeeze_udev_la_LIBADD = @ECORE_LIBS@ @UDEV_LIBS@
libeeze_udev_la_LDFLAGS = -no-undefined -version-info @version_info@ @eeze_udev_release_info@
endif

26
legacy/eeze/src/lib/udev/e_udev.c → legacy/eeze/src/lib/udev/eeze_udev.c
View File

@ -1,5 +1,5 @@
#include "e_udev_private.h"
#include <E_Udev.h>
#include "eeze_udev_private.h"
#include <Eeze_Udev.h>
/**
* @defgroup udev udev
@ -18,7 +18,7 @@
* @ingroup udev
*/
EAPI const char *
e_udev_syspath_rootdev_get(const char *syspath)
eeze_udev_syspath_rootdev_get(const char *syspath)
{
struct udev *udev;
struct udev_device *device, *parent;
@ -51,7 +51,7 @@ e_udev_syspath_rootdev_get(const char *syspath)
* @ingroup udev
*/
EAPI Eina_List *
e_udev_find_by_type(const Eudev_Type etype, const char *name)
eeze_udev_find_by_type(const Eudev_Type etype, const char *name)
{
struct udev *udev;
struct udev_enumerate *en;
@ -157,7 +157,7 @@ out:
* @ingroup udev
*/
EAPI Eina_List *
e_udev_find_by_filter(const char *subsystem, const char *type, const char *name)
eeze_udev_find_by_filter(const char *subsystem, const char *type, const char *name)
{
struct udev *udev;
struct udev_enumerate *en;
@ -212,7 +212,7 @@ out:
* @ingroup udev
*/
EAPI const char *
e_udev_syspath_get_devpath(const char *syspath)
eeze_udev_syspath_get_devpath(const char *syspath)
{
struct udev *udev;
struct udev_device *device;
@ -250,7 +250,7 @@ e_udev_syspath_get_devpath(const char *syspath)
* @ingroup udev
*/
EAPI const char *
e_udev_syspath_get_subsystem(const char *syspath)
eeze_udev_syspath_get_subsystem(const char *syspath)
{
struct udev *udev;
struct udev_device *device;
@ -289,7 +289,7 @@ e_udev_syspath_get_subsystem(const char *syspath)
* @ingroup udev
*/
EAPI const char *
e_udev_syspath_get_property(const char *syspath, const char *property)
eeze_udev_syspath_get_property(const char *syspath, const char *property)
{
struct udev *udev;
struct udev_device *device;
@ -326,7 +326,7 @@ e_udev_syspath_get_property(const char *syspath, const char *property)
* @ingroup udev
*/
EAPI const char *
e_udev_devpath_get_syspath(const char *devpath)
eeze_udev_devpath_get_syspath(const char *devpath)
{
struct udev *udev;
struct udev_enumerate *en;
@ -370,7 +370,7 @@ e_udev_devpath_get_syspath(const char *devpath)
* @ingroup udev
*/
EAPI const char *
e_udev_devpath_get_subsystem(const char *devpath)
eeze_udev_devpath_get_subsystem(const char *devpath)
{
struct udev *udev;
struct udev_enumerate *en;
@ -412,7 +412,7 @@ e_udev_devpath_get_subsystem(const char *devpath)
* @ingroup udev
*/
EAPI Eina_Bool
e_udev_syspath_is_mouse(const char *syspath)
eeze_udev_syspath_is_mouse(const char *syspath)
{
struct udev *udev;
struct udev_device *device;
@ -448,7 +448,7 @@ e_udev_syspath_is_mouse(const char *syspath)
* @ingroup udev
*/
EAPI Eina_Bool
e_udev_syspath_is_kbd(const char *syspath)
eeze_udev_syspath_is_kbd(const char *syspath)
{
struct udev *udev;
struct udev_device *device;
@ -484,7 +484,7 @@ e_udev_syspath_is_kbd(const char *syspath)
* @ingroup udev
*/
EAPI Eina_Bool
e_udev_syspath_is_touchpad(const char *syspath)
eeze_udev_syspath_is_touchpad(const char *syspath)
{
struct udev *udev;
struct udev_device *device;

12
legacy/eeze/src/lib/udev/e_udev_main.c → legacy/eeze/src/lib/udev/eeze_udev_main.c
View File

@ -1,11 +1,11 @@
#include "e_udev_private.h"
#include <E_Udev.h>
#include "eeze_udev_private.h"
#include <Eeze_Udev.h>
int _e_eeze_udev_log_dom = -1;
int _e_eeze_udev_init_count = 0;
EAPI int
e_udev_init(void)
eeze_udev_init(void)
{
if (++_e_eeze_udev_init_count != 1)
return _e_eeze_udev_init_count;
@ -14,10 +14,10 @@ e_udev_init(void)
return --_e_eeze_udev_init_count;
_e_eeze_udev_log_dom = eina_log_domain_register
("e_udev", E_EEZE_COLOR_DEFAULT);
("eeze_udev", E_EEZE_COLOR_DEFAULT);
if (_e_eeze_udev_log_dom < 0)
{
EINA_LOG_ERR("Could not register 'e_udev' log domain.");
EINA_LOG_ERR("Could not register 'eeze_udev' log domain.");
goto shutdown_eina;
}
@ -32,7 +32,7 @@ e_udev_init(void)
}
EAPI int
e_udev_shutdown(void)
eeze_udev_shutdown(void)
{
if (--_e_eeze_udev_init_count != 0)
return _e_eeze_udev_init_count;

4
legacy/eeze/src/lib/udev/e_udev_private.h → legacy/eeze/src/lib/udev/eeze_udev_private.h
View File

@ -1,5 +1,5 @@
#ifndef E_UDEV_PRIVATE_H
#define E_UDEV_PRIVATE_H
#ifndef EEZE_UDEV_PRIVATE_H
#define EEZE_UDEV_PRIVATE_H
#ifndef E_EEZE_COLOR_DEFAULT
#define E_EEZE_COLOR_DEFAULT EINA_COLOR_CYAN

8
legacy/eeze/src/lib/udev/e_udev_watch.c → legacy/eeze/src/lib/udev/eeze_udev_watch.c
View File

@ -1,5 +1,5 @@
#include "e_udev_private.h"
#include <E_Udev.h>
#include "eeze_udev_private.h"
#include <Eeze_Udev.h>
/* opaque */
struct Eudev_Watch
@ -129,7 +129,7 @@ error:
* @ingroup udev
*/
EAPI Eudev_Watch *
e_udev_watch_add(Eudev_Type type, void(*func)(const char *, const char *, void *, Eudev_Watch *), void *user_data)
eeze_udev_watch_add(Eudev_Type type, void(*func)(const char *, const char *, void *, Eudev_Watch *), void *user_data)
{
struct udev *udev;
struct udev_monitor *mon;
@ -218,7 +218,7 @@ error:
* @ingroup udev
*/
EAPI void *
e_udev_watch_del(Eudev_Watch *watch)
eeze_udev_watch_del(Eudev_Watch *watch)
{
struct udev *udev;
struct udev_monitor *mon = watch->mon;