* 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>
#include <ps3-av.h>
#include "log/log.h"
-#include "pb-system.h"
+#include "ui-system.h"
#include "ps3.h"
static const char flash_dev[] = "/dev/ps3flash";
.owner = OS_AREA_DB_OWNER_PETITBOOT, /* 3 */
.key = 3,
};
+static const struct os_area_db_id id_timeout =
+{
+ .owner = OS_AREA_DB_OWNER_PETITBOOT, /* 3 */
+ .key = 4,
+};
struct ps3_flash_ctx {
FILE *dev;
static void ps3_flash_close(struct ps3_flash_ctx *fc)
{
+ assert(fc->dev);
+
fclose(fc->dev);
fc->dev = NULL;
}
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("%s: os_area_fixed_read failed\n", __func__);
goto fail;
}
struct ps3_flash_ctx fc;
uint64_t tmp;
- memset(values, 0, sizeof(*values));
-
result = ps3_flash_open(&fc, "r");
if (result)
- return -1;
+ 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__,
strerror(errno));
if (!result)
values->default_item = (uint32_t)tmp;
- sum += result = os_area_db_get(&fc.db, &id_video_mode, &tmp);
+ result = os_area_db_get(&fc.db, &id_timeout, &tmp);
if (!result)
- values->video_mode = (uint16_t)tmp;
-
+ values->timeout = (uint8_t)tmp;
- pb_log("%s: default_item: %u\n", __func__, values->default_item);
- pb_log("%s: video_mode: %u\n", __func__, values->video_mode);
+ sum += result = os_area_db_get(&fc.db, &id_video_mode, &tmp);
- ps3_flash_close(&fc);
- return !!sum;
+ if (!result)
+ values->video_mode = (uint16_t)tmp;
+ pb_debug("%s: default_item: %x\n", __func__,
+ (unsigned int)values->default_item);
+ pb_debug("%s: timeout: %u\n", __func__,
+ (unsigned int)values->timeout);
+ pb_debug("%s: video_mode: %u\n", __func__,
+ (unsigned int)values->video_mode);
fail:
- ps3_flash_close(&fc);
- return -1;
+ return (result || sum) ? -1 : 0;
}
/**
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+");
}
}
+ /* timeout is currently read-only, set with ps3-bl-option */
+
result = os_area_db_set_32(&fc.db, &id_default_item,
values->default_item);
result += os_area_db_set_16(&fc.db, &id_video_mode,
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);
}