LED Makefile and polarity fixes
Copy the changes from pending pull request:
https://github.com/openbmc/skeleton/pull/39
These changes were done in the led_controller_new file, but
need to be ported to file led_controller since it has been renamed.
diff --git a/Makefile b/Makefile
index 49600ba..8a88a37 100755
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,8 @@
OBJS3 = obj/progress.o obj/ast-sf-ctrl.o obj/libflash.o obj/libffs.o obj/arm_io.o
INCLUDES=$(shell pkg-config --cflags gio-unix-2.0 glib-2.0) -Iincludes -Iobjects/pflash -I.
LIBS=$(shell pkg-config --libs gio-unix-2.0 glib-2.0) -Llib -lopenbmc_intf
+INCLUDES += $(shell pkg-config --cflags --libs libsystemd) -I. -O2
+LIB_FLAG += $(shell pkg-config --libs libsystemd)
%.o: interfaces/%.c
$(CC) -c -fPIC -o obj/$@ $< $(CFLAGS) $(INCLUDES)
@@ -37,7 +39,7 @@
$(CC) -o bin/$@.exe obj/gpio.o obj/power_control_obj.o obj/object_mapper.o $(LDFLAGS) $(LIBS)
led_controller: led_controller.o
- $(CC) -o bin/$@.exe obj/led_controller.o $(LDFLAGS) $(LIBS) -lsystemd
+ $(CC) -o bin/$@.exe obj/led_controller.o $(LDFLAGS) $(LIB_FLAG)
button_power: button_power_obj.o gpio.o object_mapper.o libopenbmc_intf
$(CC) -o bin/$@.exe obj/button_power_obj.o obj/gpio.o obj/object_mapper.o $(LDFLAGS) $(LIBS)
diff --git a/objects/led_controller.c b/objects/led_controller.c
index 3ceda38..b4536aa 100755
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -48,7 +48,7 @@
char led_path[128] = {0};
int len = 0;
- len = snprintf(led_path, sizeof(led_path),
+ len = snprintf(led_path, sizeof(led_path),
"/sys/class/leds/%s/%s",name, ctrl_file);
if(len >= sizeof(led_path))
{
@@ -59,16 +59,14 @@
FILE *fp = fopen(led_path,"w");
if(fp == NULL)
{
- perror("Error:");
- fprintf(stderr,"Error opening:[%s]\n",led_path);
+ fprintf(stderr,"Error:[%s] opening:[%s]\n",strerror(errno),led_path);
return rc;
}
rc = fwrite(value, strlen(value), 1, fp);
if(rc != 1)
{
- perror("Error:");
- fprintf(stderr, "Error writing to :[%s]\n",led_path);
+ fprintf(stderr, "Error:[%s] writing to :[%s]\n",strerror(errno),led_path);
}
fclose(fp);
@@ -129,11 +127,11 @@
char value_str[10] = {0};
const char *led_state = NULL;
- rc = read_led(led_name, power_ctrl, value_str, sizeof(value_str));
+ rc = read_led(led_name, power_ctrl, value_str, sizeof(value_str)-1);
if(rc >= 0)
{
- /* LED is active low */
- led_state = strtoul(value_str, NULL, 0) ? "Off" : "On";
+ /* LED is active HI */
+ led_state = strtoul(value_str, NULL, 0) ? "On" : "Off";
}
return sd_bus_reply_method_return(msg, "is", rc, led_state);
}
@@ -156,12 +154,12 @@
int rc = -1;
const char *value = NULL;
- if(strcmp(led_function, "setOn") == 0)
+ if(strcmp(led_function, "setOff") == 0)
{
/* LED active low */
value = "0";
}
- else if(strcmp(led_function, "setOff") == 0)
+ else if(strcmp(led_function, "setOn") == 0)
{
value = "255";
}
@@ -272,11 +270,11 @@
* Gets the current value of passed in LED file
* Mainly used for reading 'brightness'
* NOTE : It is the responsibility of the caller to allocate
- * sufficient space for buffer. This will read upto user supplied
+ * sufficient space for buffer. This will read upto user supplied
* size -or- entire contents of file whichever is smaller
* ----------------------------------------------------------------
*/
-int read_led(const char *name, const char *ctrl_file,
+int read_led(const char *name, const char *ctrl_file,
void *value, const size_t len)
{
/* Generic error reporter. */
@@ -293,7 +291,7 @@
char led_path[128] = {0};
int led_len = 0;
- led_len = snprintf(led_path, sizeof(led_path),
+ led_len = snprintf(led_path, sizeof(led_path),
"/sys/class/leds/%s/%s",name, ctrl_file);
if(led_len >= sizeof(led_path))
{
@@ -314,7 +312,6 @@
{
sysfs_value[count++] = fgetc(fp);
}
- sysfs_value[count]='\0';
fclose(fp);
return 0;
@@ -378,7 +375,7 @@
return rc;
}
- count_leds = num_leds = scandir("/sys/class/leds/",
+ count_leds = num_leds = scandir("/sys/class/leds/",
&led_list, led_select, alphasort);
if(num_leds <= 0)
{
@@ -427,11 +424,8 @@
while (count_leds > 0)
{
free(led_list[--count_leds]);
- if(count_leds == 0)
- {
- free(led_list);
- }
}
+ free(led_list);
/* If we had success in adding the providers, request for a bus name. */
if(rc == 0)