X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fps3.c;h=d2a57a53b2ba6bd0a6a276f4a07eebecb5d4dcbb;hp=cb1c8d1e3b9fadbb0027835d21ba0f34fca4d218;hb=HEAD;hpb=aea1d55d7e09f4544f96ccc54196c674d52420e8

diff --git a/ui/common/ps3.c b/ui/common/ps3.c
index cb1c8d1..d2a57a5 100644
--- a/ui/common/ps3.c
+++ b/ui/common/ps3.c
@@ -16,7 +16,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -77,7 +79,7 @@ static int ps3_flash_open(struct ps3_flash_ctx *fc, const char *mode)
 	fc->dev = fopen(flash_dev, mode);
 
 	if (!fc->dev) {
-		pb_log("%s: fopen failed: %s: %s\n", __func__, strerror(errno),
+		pb_log_fn("fopen failed: %s: %s\n", strerror(errno),
 			flash_dev);
 		return -1;
 	}
@@ -87,7 +89,7 @@ static int ps3_flash_open(struct ps3_flash_ctx *fc, const char *mode)
 	result = os_area_fixed_read(&fc->header, &fc->params, fc->dev);
 
 	if (result) {
-		pb_log("%s: os_area_fixed_read failed: %s\n", __func__);
+		pb_log_fn("os_area_fixed_read failed\n");
 		goto fail;
 	}
 
@@ -114,16 +116,16 @@ int ps3_flash_get_values(struct ps3_flash_values *values)
 	result = ps3_flash_open(&fc, "r");
 
 	if (result)
-		goto done;
+		goto fail;
 
 	result = os_area_db_read(&fc.db, &fc.header, fc.dev);
 
 	ps3_flash_close(&fc);
 
 	if (result) {
-		pb_log("%s: os_area_db_read failed: %s\n", __func__,
+		pb_log_fn("os_area_db_read failed: %s\n",
 			strerror(errno));
-		goto done;
+		goto fail;
 	}
 
 	sum = result = os_area_db_get(&fc.db, &id_default_item, &tmp);
@@ -141,14 +143,13 @@ int ps3_flash_get_values(struct ps3_flash_values *values)
 	if (!result)
 		values->video_mode = (uint16_t)tmp;
 
-done:
-	pb_log("%s: default_item: %x\n", __func__,
+	pb_debug("%s: default_item: %x\n", __func__,
 		(unsigned int)values->default_item);
-	pb_log("%s: timeout: %u\n", __func__,
+	pb_debug("%s: timeout: %u\n", __func__,
 		(unsigned int)values->timeout);
-	pb_log("%s: video_mode:   %u\n", __func__,
+	pb_debug("%s: video_mode:   %u\n", __func__,
 		(unsigned int)values->video_mode);
-
+fail:
 	return (result || sum) ? -1 : 0;
 }
 
@@ -164,8 +165,8 @@ int ps3_flash_set_values(const struct ps3_flash_values *values)
 	int result;
 	struct ps3_flash_ctx fc;
 
-	pb_log("%s: default_item: %u\n", __func__, values->default_item);
-	pb_log("%s: video_mode:   %u\n", __func__, values->video_mode);
+	pb_debug("%s: default_item: %u\n", __func__, values->default_item);
+	pb_debug("%s: video_mode:   %u\n", __func__, values->video_mode);
 
 	result = ps3_flash_open(&fc, "r+");
 
@@ -175,14 +176,14 @@ int ps3_flash_set_values(const struct ps3_flash_values *values)
 	result = os_area_db_read(&fc.db, &fc.header, fc.dev);
 
 	if (result) {
-		pb_log("%s: os_area_db_read failed: %s\n", __func__,
+		pb_log_fn("os_area_db_read failed: %s\n",
 			strerror(errno));
-		pb_log("%s: formating db\n", __func__);
+		pb_log_fn("formating db\n");
 
 		result = os_area_db_format(&fc.db, &fc.header, fc.dev);
 
 		if (result) {
-			pb_log("%s: db_format failed: %s\n", __func__,
+			pb_log_fn("db_format failed: %s\n",
 				strerror(errno));
 			goto fail;
 		}
@@ -219,7 +220,7 @@ static int ps3_video_ioctl(int request, unsigned int *mode_id)
 	fd = open(fb_dev, O_RDWR);
 
 	if (fd < 0) {
-		pb_log("%s: open failed: %s: %s\n", __func__, strerror(errno),
+		pb_log_fn("open failed: %s: %s\n", strerror(errno),
 			fb_dev);
 		return -1;
 	}
@@ -229,7 +230,7 @@ static int ps3_video_ioctl(int request, unsigned int *mode_id)
 	close(fd);
 
 	if (result < 0) {
-		pb_log("%s: ioctl failed: %s: %s\n", __func__, strerror(errno),
+		pb_log_fn("ioctl failed: %s: %s\n", strerror(errno),
 			fb_dev);
 		return -1;
 	}
@@ -246,7 +247,7 @@ static int ps3_video_ioctl(int request, unsigned int *mode_id)
 
 int ps3_set_video_mode(unsigned int mode_id)
 {
-	pb_log("%s: %u\n", __func__, mode_id);
+	pb_debug("%s: %u\n", __func__, mode_id);
 	return ps3_video_ioctl(PS3FB_IOCTL_SETMODE, &mode_id);
 }
 
@@ -265,6 +266,6 @@ int ps3_get_video_mode(unsigned int *mode_id)
 
 	result =  ps3_video_ioctl(PS3FB_IOCTL_GETMODE, mode_id);
 
-	pb_log("%s: %u\n", __func__, *mode_id);
+	pb_log_fn("%u\n", *mode_id);
 	return result;
 }