diff options
author | jy910.yun <jy910.yun@samsung.com> | 2013-03-20 18:02:06 +0900 |
---|---|---|
committer | jy910.yun <jy910.yun@samsung.com> | 2013-03-20 18:02:29 +0900 |
commit | 1ed5006420b3a979a2d321e19eca6ca1a7253b00 (patch) | |
tree | aa2c08c11d0afaf4efd00bb5b6ad940ee002a73f | |
parent | a9b868536aae1b3fd60a8c7399589f9eed7c363b (diff) | |
parent | 616124ee1140bdf425955a4bd664d00b5fc28d59 (diff) | |
download | libdevice-node-1ed5006420b3a979a2d321e19eca6ca1a7253b00.tar.gz libdevice-node-1ed5006420b3a979a2d321e19eca6ca1a7253b00.tar.bz2 libdevice-node-1ed5006420b3a979a2d321e19eca6ca1a7253b00.zip |
Merge branch 'master' into tizen_2.1submit/tizen_2.1/20130320.090312
Change-Id: I100e99ee29bd04a90d0e417ff7cda55d7b645a99
-rw-r--r-- | devices/display.c | 11 | ||||
-rw-r--r-- | include/devman_plugin_intf.h | 2 | ||||
-rw-r--r-- | packaging/libdevice-node.spec | 4 | ||||
-rwxr-xr-x | smack_device_labeling | 26 | ||||
-rw-r--r-- | udev/rules.d/51-devices-priv.rules | 28 | ||||
-rw-r--r-- | udev/rules.d/95-devices.rules | 67 | ||||
-rw-r--r-- | udev/rules.d/95-permissions-slp.rules | 64 |
7 files changed, 105 insertions, 97 deletions
diff --git a/devices/display.c b/devices/display.c index f4355ff..57bb713 100644 --- a/devices/display.c +++ b/devices/display.c @@ -28,6 +28,7 @@ static int display_get_prop(int __prop, int *val) { int prop = PROPERTY_PROP(__prop); int index = PROPERTY_INDEX(__prop); + int lux = index; int ps_stat; int ps_disp_stat; int disp_cnt; @@ -39,9 +40,11 @@ static int display_get_prop(int __prop, int *val) return -1; } - if (index >= disp_cnt) { - DEVERR("Invalid Argument: index(%d) > max(%d)", index, disp_cnt); - return -1; + if (prop != PROP_DISPLAY_BRIGHTNESS_BY_LUX) { + if (index >= disp_cnt) { + DEVERR("Invalid Argument: index(%d) > max(%d)", index, disp_cnt); + return -1; + } } switch (prop) { @@ -61,7 +64,7 @@ static int display_get_prop(int __prop, int *val) case PROP_DISPLAY_ONOFF: return PLUGIN_GET(lcd_power)(index, val); case PROP_DISPLAY_BRIGHTNESS_BY_LUX: - return PLUGIN_GET(backlight_brightness_by_lux)(val); + return PLUGIN_GET(backlight_brightness_by_lux)(lux, val); case PROP_DISPLAY_IMAGE_ENHANCE_MODE: return PLUGIN_GET(image_enhance_mode)(val); case PROP_DISPLAY_IMAGE_ENHANCE_SCENARIO: diff --git a/include/devman_plugin_intf.h b/include/devman_plugin_intf.h index 7053c3a..15e88af 100644 --- a/include/devman_plugin_intf.h +++ b/include/devman_plugin_intf.h @@ -161,7 +161,7 @@ typedef struct { int (*OEM_sys_get_cpufreq_scaling_min_freq) (int *value); int (*OEM_sys_set_cpufreq_scaling_min_freq) (int value); - int (*OEM_sys_get_backlight_brightness_by_lux) (int lux); + int (*OEM_sys_get_backlight_brightness_by_lux) (int lux, int *value); int (*OEM_sys_get_whitemagic_mode) (int index, int *value); int (*OEM_sys_set_whitemagic_mode) (int index, int value); diff --git a/packaging/libdevice-node.spec b/packaging/libdevice-node.spec index c8a9640..50a1336 100644 --- a/packaging/libdevice-node.spec +++ b/packaging/libdevice-node.spec @@ -1,11 +1,11 @@ Name: libdevice-node Summary: Library to control OAL APIs Version: 0.1.0 -Release: 0 +Release: 1 Group: System/Libraries License: Apache License, Version 2.0 Source0: %{name}-%{version}.tar.gz -Source1: %{name}.manifest +Source1: %{name}.manifest BuildRequires: cmake BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(dlog) diff --git a/smack_device_labeling b/smack_device_labeling index 0e33a21..952783e 100755 --- a/smack_device_labeling +++ b/smack_device_labeling @@ -1,32 +1,6 @@ #!/bin/sh # Set device node permissions for security -chsmack -a 'device::camera' /dev/video1 -chsmack -a 'device::camera' /dev/s3c-jpg -chsmack -a 'device::app_logging' /dev/log_main -chsmack -a 'device::app_logging' /dev/log_events -chsmack -a 'device::app_logging' /dev/log_radio -chsmack -a 'device::sys_logging' /dev/log_system -chsmack -a 'device::audio' /dev/snd/ -chsmack -a 'device::audio' /dev/snd/controlC0 -chsmack -a 'device::audio' /dev/snd/pcmC0D0p -chsmack -a 'device::audio' /dev/snd/pcmC0D1p -chsmack -a 'device::audio' /dev/snd/pcmC0D2p -chsmack -a 'device::audio' /dev/snd/pcmC0D3p -chsmack -a 'device::audio' /dev/snd/timer -chsmack -a 'device::recording' /dev/snd/pcmC0D0c -chsmack -a 'device::recording' /dev/snd/pcmC0D1c -chsmack -a 'device::recording' /dev/snd/pcmC0D2c -chsmack -a 'device::recording' /dev/snd/pcmC0D3c -chsmack -a 'device::hwcodec' /dev/s3c-mfc -chsmack -a 'device::hwcodec' /dev/video5 -chsmack -a 'device::hwcodec' /dev/video6 -chsmack -a 'device::video' /dev/fb0 -chsmack -a 'device::video' /dev/video0 -chsmack -a 'device::video' /dev/video2 -chsmack -a 'device::video' /dev/video3 -chsmack -a 'device::video' /dev/s3c-mem -chsmack -a 'device::radio' /dev/radio0 chsmack -a 'device::bklight' /sys/class/backlight/*/brightness chsmack -a 'device::led' /sys/class/camera/flash/rear_flash chsmack -a 'device::led' /sys/class/camera/flash/max_brightness diff --git a/udev/rules.d/51-devices-priv.rules b/udev/rules.d/51-devices-priv.rules new file mode 100644 index 0000000..a4b3741 --- /dev/null +++ b/udev/rules.d/51-devices-priv.rules @@ -0,0 +1,28 @@ +# this part is extracted from 50-udev-default.rules file only to add smack label + +SUBSYSTEM=="tty", KERNEL=="ptmx", SMACK="*" +SUBSYSTEM=="tty", KERNEL=="tty", SMACK="*" +SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", SMACK="*" +SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", SMACK="*" + +# serial +KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", SMACK="*" + +# video4linux +SUBSYSTEM=="video4linux", SMACK="*" + +# graphics +SUBSYSTEM=="drm", MODE="0666", SMACK="*" + +# 'libusb' device nodes +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", SMACK="*" + +KERNEL=="fuse", SMACK="*" + +# this part is high priority udev rules + +KERNEL=="null|zero|full|random|urandom", SMACK="*" +KERNEL=="uinput", MODE="0666", SMACK="*" +KERNEL=="ump", MODE="0666", SMACK="*" +KERNEL=="mali", MODE="0666", SMACK="*" +KERNEL=="slp_global_lock", MODE="0666", SMACK="*" diff --git a/udev/rules.d/95-devices.rules b/udev/rules.d/95-devices.rules new file mode 100644 index 0000000..d6ddade --- /dev/null +++ b/udev/rules.d/95-devices.rules @@ -0,0 +1,67 @@ +ACTION=="remove", GOTO="devices_end" + +KERNEL=="fb[0-9]", MODE="0660", GROUP="video", SMACK="device::video" +KERNEL=="s3c-mem", MODE="0660", GROUP="video", SMACK="device::video" +KERNEL=="umts_csd", MODE="0660", GROUP="video_tel", SMACK="*" +KERNEL=="s3c-jpeg", MODE="0660", GROUP="camera", SMACK="device::camera" +KERNEL=="s5p-jpeg", MODE="0660", GROUP="camera", SMACK="device::camera" +KERNEL=="s3c-jpg", MODE="0660", GROUP="camera", SMACK="device::camera" +KERNEL=="srp", MODE="0660", GROUP="hwcodec", SMACK="*" +KERNEL=="s3c-mfc", MODE="0660", GROUP="hwcodec", SMACK="device::hwcodec" +KERNEL=="s5p-mfc", MODE="0660", GROUP="hwcodec", SMACK="*" +KERNEL=="radio[0-9]", MODE="0660", GROUP="radio", SMACK="device::radio" +KERNEL=="pcmC[0-9]D[0-9]c", MODE="0660", GROUP="recording", SMACK="device::recording" +KERNEL=="pcmC[0-9]D[0-9]p", MODE="0660", GROUP="audio", SMACK="device::audio" +KERNEL=="controlC[0-9]", MODE="0660", GROUP="audio", SMACK="device::audio" +KERNEL=="timer", SUBSYSTEM=="sound", MODE="0660", GROUP="audio", SMACK="device::audio" + +KERNEL=="log_main", MODE="0660", GROUP="app_logging", SMACK="device::app_logging" +KERNEL=="log_events", MODE="0660", GROUP="app_logging", SMACK="device::app_logging" +KERNEL=="log_radio", MODE="0660", GROUP="app_logging", SMACK="device::app_logging" +KERNEL=="log_system", MODE="0660", GROUP="sys_logging", SMACK="device::sys_logging" + +KERNEL=="pvrsrvkm", MODE="0666", SMACK="*" +KERNEL=="usb_mtp_gadget", MODE="0666", SMACK="*" +KERNEL=="usb_accessory", MODE="0666", SMACK="*" + +# Marvell +KERNEL=="uio[0-9]", MODE="0666", SMACK="*" + +# Brightness control +SUBSYSTEM=="leds", ATTR{brightness}=="?*", RUN+="/bin/chmod 0664 %S/%p/brightness", RUN+="/bin/chown :system_torch %S/%p/brightness" +SUBSYSTEM=="backlight", ATTR{brightness}=="?*", RUN+="/bin/chmod 0664 %S/%p/brightness", RUN+="/bin/chown :system_bklight %S/%p/brightness" + +# flash (7/16 added) +SUBSYSTEM=="camera", RUN+="/bin/chmod 0666 %S/%p/rear_flash" +SUBSYSTEM=="camera", RUN+="/bin/chmod 0666 %S/%p/max_brightness" + +# mDNIe +DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/mode" +DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/scenario" +DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/tone" +DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/outdoor" +DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/tune" + +# haptic +SUBSYSTEM=="haptic", RUN+="/bin/chmod 0666 %S/%p/level" +SUBSYSTEM=="haptic", RUN+="/bin/chmod 0666 %S/%p/enable" +SUBSYSTEM=="haptic", RUN+="/bin/chmod 0666 %S/%p/oneshot" + +# Video4Linux +SUBSYSTEM!="video4linux", GOTO="v4l_end" +IMPORT{program}="uname_env kernel-release" + +KERNEL=="video0", ENV{UNAME_KERNEL_RELEASE}=="3.0.*", GROUP="camera", MODE="0660", SMACK="device::camera", GOTO="v4l_end" +KERNEL=="video1", ENV{UNAME_KERNEL_RELEASE}=="3.4.*", GROUP="camera", MODE="0660", SMACK="device::camera", GOTO="v4l_end" +KERNEL=="video3", ENV{UNAME_KERNEL_RELEASE}=="3.4.*", GROUP="camera", MODE="0660", SMACK="device::camera", GOTO="v4l_end" + +# Remaining video devices +KERNEL=="video[0-9]", MODE="0660", GROUP="video", SMACK="device::video" +LABEL="v4l_end" + +KERNEL=="video1", GROUP="camera", MODE="0660", SMACK="device::camera" +KERNEL=="video[6-7]", GROUP="hwcodec", MODE="0660", SMACK="device::hwcodec" +KERNEL=="video11", GROUP="hwcodec", MODE="0660", SMACK="device::hwcodec" +KERNEL=="video12", GROUP="hwcodec", MODE="0660", SMACK="device::hwcodec" + +LABEL="devices_end" diff --git a/udev/rules.d/95-permissions-slp.rules b/udev/rules.d/95-permissions-slp.rules deleted file mode 100644 index f092b12..0000000 --- a/udev/rules.d/95-permissions-slp.rules +++ /dev/null @@ -1,64 +0,0 @@ -ACTION=="remove", GOTO="permissions_slp_end" - -KERNEL=="s3c-jpeg", MODE="0660", GROUP="camera" -KERNEL=="s5p-jpeg", MODE="0660", GROUP="camera" -KERNEL=="radio[0-9]", MODE="0660", GROUP="radio" -KERNEL=="s5p-mfc", MODE="0660", GROUP="hwcodec" -KERNEL=="s3c-mfc", MODE="0660", GROUP="hwcodec" -KERNEL=="srp", MODE="0660", GROUP="hwcodec" -KERNEL=="log_main", MODE="0660", GROUP="app_logging" -KERNEL=="log_events", MODE="0660", GROUP="app_logging" -KERNEL=="log_radio", MODE="0660", GROUP="app_logging" -KERNEL=="log_system", MODE="0660", GROUP="sys_logging" -KERNEL=="controlC0D[0-9]c", MODE="0660", GROUP="recording" -KERNEL=="pcmC0D[0-9]c", MODE="0660", GROUP="recording" -KERNEL=="controlC0", MODE="0660", GROUP="audio" -KERNEL=="pcmC0D[0-9]p", MODE="0660", GROUP="audio" -KERNEL=="fb[0-9]", MODE="0660", GROUP="video" -KERNEL=="s3c-mem", MODE="0660", GROUP="video" -KERNEL=="umts_csd", MODE="0660", GROUP="video_tel" - -KERNEL=="pvrsrvkm", MODE="0666" -KERNEL=="ump", MODE="0666" -KERNEL=="mali", MODE="0666" -KERNEL=="slp_global_lock", MODE="0666" -KERNEL=="usb_mtp_gadget", MODE="0666" -KERNEL=="usb_accessory", MODE="0666" -SUBSYSTEM=="drm", MODE="0666" - -# Marvell -KERNEL=="uio[0-9]", MODE="0666" - -# Brightness control -SUBSYSTEM=="leds", ATTR{brightness}=="?*", RUN+="/bin/chmod 0664 %S/%p/brightness", RUN+="/bin/chown :system_torch %S/%p/brightness" -SUBSYSTEM=="backlight", ATTR{brightness}=="?*", RUN+="/bin/chmod 0664 %S/%p/brightness", RUN+="/bin/chown :system_bklight %S/%p/brightness" - -# flash (7/16 added) -SUBSYSTEM=="camera", RUN+="/bin/chmod 0666 %S/%p/rear_flash" -SUBSYSTEM=="camera", RUN+="/bin/chmod 0666 %S/%p/max_brightness" - -# mDNIe -DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/mode" -DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/scenario" -DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/tone" -DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/outdoor" -DRIVER=="mdnie", RUN+="/bin/chmod 0666 %S/%p/tune" - -# haptic -SUBSYSTEM=="haptic", RUN+="/bin/chmod 0666 %S/%p/level" -SUBSYSTEM=="haptic", RUN+="/bin/chmod 0666 %S/%p/enable" -SUBSYSTEM=="haptic", RUN+="/bin/chmod 0666 %S/%p/oneshot" - -# Video4Linux -SUBSYSTEM!="video4linux", GOTO="v4l_slp_end" -IMPORT{program}="uname_env kernel-release" - -KERNEL=="video0", ENV{UNAME_KERNEL_RELEASE}=="3.0.*", GROUP="camera", MODE="0660", GOTO="v4l_slp_end" -KERNEL=="video1", ENV{UNAME_KERNEL_RELEASE}=="3.4.*", GROUP="camera", MODE="0660", GOTO="v4l_slp_end" -KERNEL=="video3", ENV{UNAME_KERNEL_RELEASE}=="3.4.*", GROUP="camera", MODE="0660", GOTO="v4l_slp_end" - -# Remaining video devices -KERNEL=="video[0-9]", MODE="0660", GROUP="video" -LABEL="v4l_slp_end" - -LABEL="permissions_slp_end" |