From d94e47c757c2645608e01386a348d63b50bf3748 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 2 Nov 2013 20:24:56 +0100 Subject: [PATCH] spark: use proc_tools --- libspark/audio.cpp | 15 ++------------- libspark/video.cpp | 43 +++---------------------------------------- 2 files changed, 5 insertions(+), 53 deletions(-) diff --git a/libspark/audio.cpp b/libspark/audio.cpp index ccfd514..8c72a63 100644 --- a/libspark/audio.cpp +++ b/libspark/audio.cpp @@ -6,6 +6,8 @@ #include #include + +#include #include "audio_hal.h" #include "audio_priv.h" #include "lt_debug.h" @@ -19,19 +21,6 @@ cAudio * audioDecoder = NULL; ADec *adec = NULL; -static int proc_put(const char *path, const char *value, const int len) -{ - int ret, ret2; - int pfd = open(path, O_WRONLY); - if (pfd < 0) - return pfd; - ret = write(pfd, value, len); - ret2 = close(pfd); - if (ret2 < 0) - return ret2; - return ret; -} - cAudio::cAudio(void *, void *, void *) { adec = new ADec(); diff --git a/libspark/video.cpp b/libspark/video.cpp index 9f1c489..007282b 100644 --- a/libspark/video.cpp +++ b/libspark/video.cpp @@ -36,6 +36,9 @@ #include "video_hal.h" #include "video_priv.h" #include "lt_debug.h" + +#include + #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_VIDEO, this, args) #define lt_info(args...) _lt_info(TRIPLE_DEBUG_VIDEO, this, args) #define lt_debug_c(args...) _lt_debug(TRIPLE_DEBUG_VIDEO, NULL, args) @@ -97,46 +100,6 @@ static const char *VMPEG_framerate[] = { #define VIDEO_STREAMTYPE_VC1_SM 5 #define VIDEO_STREAMTYPE_MPEG1 6 - -static int proc_put(const char *path, const char *value, const int len) -{ - int ret, ret2; - int pfd = open(path, O_WRONLY); - if (pfd < 0) - return pfd; - ret = write(pfd, value, len); - ret2 = close(pfd); - if (ret2 < 0) - return ret2; - return ret; -} - -static int proc_get(const char *path, char *value, const int len) -{ - int ret, ret2; - int pfd = open(path, O_RDONLY); - if (pfd < 0) - return pfd; - ret = read(pfd, value, len); - value[len-1] = '\0'; /* make sure string is terminated */ - while (ret > 0 && isspace(value[ret-1])) - value[--ret] = '\0'; /* remove trailing whitespace */ - ret2 = close(pfd); - if (ret2 < 0) - return ret2; - return ret; -} - -static unsigned int proc_get_hex(const char *path) -{ - unsigned int n, ret = 0; - char buf[16]; - n = proc_get(path, buf, 16); - if (n > 0) - sscanf(buf, "%x", &ret); - return ret; -} - static int hdmi_out(bool enable) { struct stmfbio_output_configuration out;