Return pwm handle through pointer argument

Change-Id: I3b62a841edaafe2298592132cb2fdd8ed23a9694
Signed-off-by: jino.cho <jino.cho@samsung.com>

diff --git a/include/peripheral_io.h b/include/peripheral_io.h
index a0b7fad6966b349f344ec5ecc824906cee0b44e5..95bc38a4f6fac3acfb2da8a72e7752e8e052f354 100644 (file)
--- a/include/peripheral_io.h
+++ b/include/peripheral_io.h
@@ -388,7 +388,7 @@ typedef enum {
        PERIPHERAL_PWM_ENABLE,
 } peripheral_pwm_state_e;
 
        PERIPHERAL_PWM_ENABLE,
 } peripheral_pwm_state_e;
 

-peripheral_pwm_h peripheral_pwm_open(int device, int channel);
+int peripheral_pwm_open(int device, int channel, peripheral_pwm_h *pwm);

 
 int peripheral_pwm_close(peripheral_pwm_h pwm);
 
 
 int peripheral_pwm_close(peripheral_pwm_h pwm);
 

diff --git a/src/peripheral_pwm.c b/src/peripheral_pwm.c
index ea08352d7ebf9049294b216d2d942e349c167dac..9c291b03a918f817404bb834842188ac33dec326 100644 (file)
--- a/src/peripheral_pwm.c
+++ b/src/peripheral_pwm.c
@@ -26,7 +26,7 @@
 #define PWM_ENABLE     1
 #define PWM_DISABLE    0
 
 #define PWM_ENABLE     1
 #define PWM_DISABLE    0
 

-peripheral_pwm_h peripheral_pwm_open(int device, int channel)
+int peripheral_pwm_open(int device, int channel, peripheral_pwm_h* pwm)

 {
        peripheral_pwm_h dev = NULL;
        int ret = PERIPHERAL_ERROR_NONE;
 {
        peripheral_pwm_h dev = NULL;
        int ret = PERIPHERAL_ERROR_NONE;


@@ -39,7 +39,7 @@ peripheral_pwm_h peripheral_pwm_open(int device, int channel)
 
        if (dev == NULL) {
                _E("Failed to allocate peripheral_pwm_h");
 
        if (dev == NULL) {
                _E("Failed to allocate peripheral_pwm_h");

-               return NULL;
+               return PERIPHERAL_ERROR_OUT_OF_MEMORY;

        }
 
        pwm_proxy_init();
        }
 
        pwm_proxy_init();


@@ -50,11 +50,13 @@ peripheral_pwm_h peripheral_pwm_open(int device, int channel)
        ret = peripheral_gdbus_pwm_open(dev, device, channel);
 
        if (ret != PERIPHERAL_ERROR_NONE) {
        ret = peripheral_gdbus_pwm_open(dev, device, channel);
 
        if (ret != PERIPHERAL_ERROR_NONE) {

+               _E("PWM open error (%d, %d)", device, channel);

                free(dev);
                dev = NULL;
        }
                free(dev);
                dev = NULL;
        }

+       *pwm = dev;

 
 

-       return dev;
+       return ret;

 }
 
 int peripheral_pwm_close(peripheral_pwm_h pwm)
 }
 
 int peripheral_pwm_close(peripheral_pwm_h pwm)

diff --git a/test/peripheral-io-test.c b/test/peripheral-io-test.c
index 21d0a8b6b49c0e9944cc44e7a6841464e1905126..699be4aafa9b281e91369aa00b376e4d70eb7d1c 100644 (file)
--- a/test/peripheral-io-test.c
+++ b/test/peripheral-io-test.c
@@ -224,7 +224,7 @@ int pwm_test_led(void)
 
        printf("<<< pwm_test >>>\n");
 
 
        printf("<<< pwm_test >>>\n");
 

-       dev = peripheral_pwm_open(device, channel);
+       peripheral_pwm_open(device, channel, &dev);

        peripheral_pwm_set_period(dev, period); /* period: nanosecond */
        peripheral_pwm_set_duty_cycle(dev, duty_cycle); /* duty_cycle: nanosecond */
        peripheral_pwm_set_enabled(dev, 1);     /* 0: disable, 1: enable */
        peripheral_pwm_set_period(dev, period); /* period: nanosecond */
        peripheral_pwm_set_duty_cycle(dev, duty_cycle); /* duty_cycle: nanosecond */
        peripheral_pwm_set_enabled(dev, 1);     /* 0: disable, 1: enable */


@@ -265,7 +265,7 @@ int pwm_test_motor(void)
 
        printf("<<< pwm_test_motor >>>\n");
 
 
        printf("<<< pwm_test_motor >>>\n");
 

-       dev = peripheral_pwm_open(device, channel);
+       peripheral_pwm_open(device, channel, &dev);

        for (cnt = 0; cnt < 5; cnt++) {
                for (idx = 0; idx < 3; idx++) {
                        switch (degree[idx]) {
        for (cnt = 0; cnt < 5; cnt++) {
                for (idx = 0; idx < 3; idx++) {
                        switch (degree[idx]) {