len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move screendump from apps to firmware, solving two nasty firmware-to-apps calls. This required to move the filename creation functions as well. * Fix bug in the BMP header of Clip screendumps. * Add remote screendump for targets with an LCD remote. * Simplify some ifdefs and rename a macro in the sim.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19967 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2009-02-10 23:43:37 +00:00
parent eddb5680f9
commit 11ad7b4bc8
15 changed files with 181 additions and 409 deletions
Download patch file Download diff file Expand all files Collapse all files

330
apps/misc.c
View file

@ -135,109 +135,6 @@ char *output_dyn_value(char *buf, int buf_size, int value,
return buf; return buf;
} }
/* Create a filename with a number part in a way that the number is 1
* higher than the highest numbered file matching the same pattern.
* It is allowed that buffer and path point to the same memory location,
* saving a strcpy(). Path must always be given without trailing slash.
* "num" can point to an int specifying the number to use or NULL or a value
* less than zero to number automatically. The final number used will also
* be returned in *num. If *num is >= 0 then *num will be incremented by
* one. */
char *create_numbered_filename(char *buffer, const char *path,
const char *prefix, const char *suffix,
int numberlen IF_CNFN_NUM_(, int *num))
{
DIR *dir;
struct dirent *entry;
int max_num;
int pathlen;
int prefixlen = strlen(prefix);
char fmtstring[12];
if (buffer != path)
strncpy(buffer, path, MAX_PATH);
pathlen = strlen(buffer);
#ifdef IF_CNFN_NUM
if (num && *num >= 0)
{
/* number specified */
max_num = *num;
}
else
#endif
{
/* automatic numbering */
max_num = 0;
dir = opendir(pathlen ? buffer : "/");
if (!dir)
return NULL;
while ((entry = readdir(dir)))
{
int curr_num;
if (strncasecmp((char *)entry->d_name, prefix, prefixlen)
|| strcasecmp((char *)entry->d_name + prefixlen + numberlen, suffix))
continue;
curr_num = atoi((char *)entry->d_name + prefixlen);
if (curr_num > max_num)
max_num = curr_num;
}
closedir(dir);
}
max_num++;
snprintf(fmtstring, sizeof(fmtstring), "/%%s%%0%dd%%s", numberlen);
snprintf(buffer + pathlen, MAX_PATH - pathlen, fmtstring, prefix,
max_num, suffix);
#ifdef IF_CNFN_NUM
if (num)
*num = max_num;
#endif
return buffer;
}
#if CONFIG_RTC
/* Create a filename with a date+time part.
It is allowed that buffer and path point to the same memory location,
saving a strcpy(). Path must always be given without trailing slash.
unique_time as true makes the function wait until the current time has
changed. */
char *create_datetime_filename(char *buffer, const char *path,
const char *prefix, const char *suffix,
bool unique_time)
{
struct tm *tm = get_time();
static struct tm last_tm;
int pathlen;
while (unique_time && !memcmp(get_time(), &last_tm, sizeof (struct tm)))
sleep(HZ/10);
last_tm = *tm;
if (buffer != path)
strncpy(buffer, path, MAX_PATH);
pathlen = strlen(buffer);
snprintf(buffer + pathlen, MAX_PATH - pathlen,
"/%s%02d%02d%02d-%02d%02d%02d%s", prefix,
tm->tm_year % 100, tm->tm_mon + 1, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec, suffix);
return buffer;
}
#endif /* CONFIG_RTC */
/* Ask the user if they really want to erase the current dynamic playlist /* Ask the user if they really want to erase the current dynamic playlist
* returns true if the playlist should be replaced */ * returns true if the playlist should be replaced */
bool warn_on_pl_erase(void) bool warn_on_pl_erase(void)
@ -339,233 +236,6 @@ int fast_readline(int fd, char *buf, int buf_size, void *parameters,
return 0; return 0;
} }
#ifdef HAVE_LCD_BITMAP
#if LCD_DEPTH == 16
#define BMP_COMPRESSION 3 /* BI_BITFIELDS */
#define BMP_NUMCOLORS 3
#else /* LCD_DEPTH != 16 */
#define BMP_COMPRESSION 0 /* BI_RGB */
#if LCD_DEPTH <= 8
#ifdef HAVE_LCD_SPLIT
#define BMP_NUMCOLORS (2 << LCD_DEPTH)
#else
#define BMP_NUMCOLORS (1 << LCD_DEPTH)
#endif
#else /* LCD_DEPTH > 8 */
#define BMP_NUMCOLORS 0
#endif /* LCD_DEPTH > 8 */
#endif /* LCD_DEPTH != 16 */
#if LCD_DEPTH <= 4
#define BMP_BPP 4
#define BMP_LINESIZE ((LCD_WIDTH/2 + 3) & ~3)
#elif LCD_DEPTH <= 8
#define BMP_BPP 8
#define BMP_LINESIZE ((LCD_WIDTH + 3) & ~3)
#elif LCD_DEPTH <= 16
#define BMP_BPP 16
#define BMP_LINESIZE ((LCD_WIDTH*2 + 3) & ~3)
#else
#define BMP_BPP 24
#define BMP_LINESIZE ((LCD_WIDTH*3 + 3) & ~3)
#endif
#define BMP_HEADERSIZE (54 + 4 * BMP_NUMCOLORS)
#define BMP_DATASIZE (BMP_LINESIZE * LCD_HEIGHT)
#define BMP_TOTALSIZE (BMP_HEADERSIZE + BMP_DATASIZE)
#define LE16_CONST(x) (x)&0xff, ((x)>>8)&0xff
#define LE32_CONST(x) (x)&0xff, ((x)>>8)&0xff, ((x)>>16)&0xff, ((x)>>24)&0xff
static const unsigned char bmpheader[] =
{
0x42, 0x4d, /* 'BM' */
LE32_CONST(BMP_TOTALSIZE), /* Total file size */
0x00, 0x00, 0x00, 0x00, /* Reserved */
LE32_CONST(BMP_HEADERSIZE), /* Offset to start of pixel data */
0x28, 0x00, 0x00, 0x00, /* Size of (2nd) header */
LE32_CONST(LCD_WIDTH), /* Width in pixels */
LE32_CONST(LCD_HEIGHT+LCD_SPLIT_LINES), /* Height in pixels */
0x01, 0x00, /* Number of planes (always 1) */
LE16_CONST(BMP_BPP), /* Bits per pixel 1/4/8/16/24 */
LE32_CONST(BMP_COMPRESSION),/* Compression mode */
LE32_CONST(BMP_DATASIZE), /* Size of bitmap data */
0xc4, 0x0e, 0x00, 0x00, /* Horizontal resolution (pixels/meter) */
0xc4, 0x0e, 0x00, 0x00, /* Vertical resolution (pixels/meter) */
LE32_CONST(BMP_NUMCOLORS), /* Number of used colours */
LE32_CONST(BMP_NUMCOLORS), /* Number of important colours */
#if LCD_DEPTH == 1
#ifdef HAVE_NEGATIVE_LCD
BMP_COLOR(LCD_BL_DARKCOLOR),
BMP_COLOR(LCD_BL_BRIGHTCOLOR),
#ifdef HAVE_LCD_SPLIT
BMP_COLOR(LCD_BL_DARKCOLOR_2),
BMP_COLOR(LCD_BL_BRIGHTCOLOR_2),
#endif
#else /* positive display */
BMP_COLOR(LCD_BL_BRIGHTCOLOR),
BMP_COLOR(LCD_BL_DARKCOLOR),
#endif /* positive display */
#elif LCD_DEPTH == 2
BMP_COLOR(LCD_BL_BRIGHTCOLOR),
BMP_COLOR_MIX(LCD_BL_BRIGHTCOLOR, LCD_BL_DARKCOLOR, 1, 3),
BMP_COLOR_MIX(LCD_BL_BRIGHTCOLOR, LCD_BL_DARKCOLOR, 2, 3),
BMP_COLOR(LCD_BL_DARKCOLOR),
#elif LCD_DEPTH == 16
0x00, 0xf8, 0x00, 0x00, /* red bitfield mask */
0xe0, 0x07, 0x00, 0x00, /* green bitfield mask */
0x1f, 0x00, 0x00, 0x00, /* blue bitfield mask */
#endif
};
static void (*screen_dump_hook)(int fh) = NULL;
void screen_dump(void)
{
int fd, y;
char filename[MAX_PATH];
fb_data *src;
#if LCD_DEPTH == 1
unsigned mask;
unsigned val;
#elif (LCD_DEPTH == 2) && (LCD_PIXELFORMAT != HORIZONTAL_PACKING)
int shift;
unsigned val;
#endif
#if LCD_DEPTH <= 8
unsigned char *dst, *dst_end;
unsigned char linebuf[BMP_LINESIZE];
#elif LCD_DEPTH <= 16
unsigned short *dst, *dst_end;
unsigned short linebuf[BMP_LINESIZE/2];
#endif
#if CONFIG_RTC
create_datetime_filename(filename, "", "dump ", ".bmp", false);
#else
create_numbered_filename(filename, "", "dump_", ".bmp", 4
IF_CNFN_NUM_(, NULL));
#endif
fd = creat(filename);
if (fd < 0)
return;
if (screen_dump_hook)
{
screen_dump_hook(fd);
}
else
{
write(fd, bmpheader, sizeof(bmpheader));
/* BMP image goes bottom up */
for (y = LCD_HEIGHT - 1; y >= 0; y--)
{
memset(linebuf, 0, BMP_LINESIZE);
#if defined(HAVE_LCD_SPLIT) && (LCD_SPLIT_LINES == 2)
if (y == LCD_SPLIT_POS - 1)
{
write(fd, linebuf, BMP_LINESIZE);
write(fd, linebuf, BMP_LINESIZE);
}
#endif
dst = linebuf;
#if LCD_DEPTH == 1
dst_end = dst + LCD_WIDTH/2;
src = lcd_framebuffer[y >> 3];
mask = 1 << (y & 7);
do
{
val = (*src++ & mask) ? 0x10 : 0;
val |= (*src++ & mask) ? 0x01 : 0;
#ifdef HAVE_LCD_SPLIT
if (y < LCD_SPLIT_POS)
val |= 0x22;
#endif
*dst++ = val;
}
while (dst < dst_end);
#elif LCD_DEPTH == 2
dst_end = dst + LCD_WIDTH/2;
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
src = lcd_framebuffer[y];
do
{
unsigned data = *src++;
*dst++ = ((data >> 2) & 0x30) | ((data >> 4) & 0x03);
*dst++ = ((data << 2) & 0x30) | (data & 0x03);
}
while (dst < dst_end);
#elif LCD_PIXELFORMAT == VERTICAL_PACKING
src = lcd_framebuffer[y >> 2];
shift = 2 * (y & 3);
do
{
val = ((*src++ >> shift) & 3) << 4;
val |= ((*src++ >> shift) & 3);
*dst++ = val;
}
while (dst < dst_end);
#elif LCD_PIXELFORMAT == VERTICAL_INTERLEAVED
src = lcd_framebuffer[y >> 3];
shift = y & 7;
do
{
unsigned data = (*src++ >> shift) & 0x0101;
val = (((data >> 7) | data) & 3) << 4;
data = (*src++ >> shift) & 0x0101;
val |= ((data >> 7) | data) & 3;
*dst++ = val;
}
while (dst < dst_end);
#endif
#elif LCD_DEPTH == 16
dst_end = dst + LCD_WIDTH;
src = lcd_framebuffer[y];
do
{
#if (LCD_PIXELFORMAT == RGB565SWAPPED)
/* iPod LCD data is big endian although the CPU is not */
*dst++ = htobe16(*src++);
#else
*dst++ = htole16(*src++);
#endif
}
while (dst < dst_end);
#endif /* LCD_DEPTH */
write(fd, linebuf, BMP_LINESIZE);
}
}
close(fd);
}
void screen_dump_set_hook(void (*hook)(int fh))
{
screen_dump_hook = hook;
}
#endif /* HAVE_LCD_BITMAP */
/* parse a line from a configuration file. the line format is: /* parse a line from a configuration file. the line format is:
name: value name: value

50
apps/misc.h
View file

@ -33,27 +33,6 @@
char *output_dyn_value(char *buf, int buf_size, int value, char *output_dyn_value(char *buf, int buf_size, int value,
const unsigned char **units, bool bin_scale); const unsigned char **units, bool bin_scale);
/* Create a filename with a number part in a way that the number is 1
* higher than the highest numbered file matching the same pattern.
* It is allowed that buffer and path point to the same memory location,
* saving a strcpy(). Path must always be given without trailing slash.
*
* "num" can point to an int specifying the number to use or NULL or a value
* less than zero to number automatically. The final number used will also
* be returned in *num. If *num is >= 0 then *num will be incremented by
* one. */
#if defined(HAVE_RECORDING) && (CONFIG_RTC == 0)
/* this feature is needed by recording without a RTC to prevent disk access
when changing files */
#define IF_CNFN_NUM_(...) __VA_ARGS__
#define IF_CNFN_NUM
#else
#define IF_CNFN_NUM_(...)
#endif
char *create_numbered_filename(char *buffer, const char *path,
const char *prefix, const char *suffix,
int numberlen IF_CNFN_NUM_(, int *num));
/* Format time into buf. /* Format time into buf.
* *
* buf - buffer to format to. * buf - buffer to format to.
@ -62,17 +41,6 @@ char *create_numbered_filename(char *buffer, const char *path,
*/ */
void format_time(char* buf, int buf_size, long t); void format_time(char* buf, int buf_size, long t);
#if CONFIG_RTC
/* Create a filename with a date+time part.
It is allowed that buffer and path point to the same memory location,
saving a strcpy(). Path must always be given without trailing slash.
unique_time as true makes the function wait until the current time has
changed. */
char *create_datetime_filename(char *buffer, const char *path,
const char *prefix, const char *suffix,
bool unique_time);
#endif /* CONFIG_RTC */
/* Ask the user if they really want to erase the current dynamic playlist /* Ask the user if they really want to erase the current dynamic playlist
* returns true if the playlist should be replaced */ * returns true if the playlist should be replaced */
bool warn_on_pl_erase(void); bool warn_on_pl_erase(void);
@ -87,24 +55,6 @@ int read_line(int fd, char* buffer, int buffer_size);
int fast_readline(int fd, char *buf, int buf_size, void *parameters, int fast_readline(int fd, char *buf, int buf_size, void *parameters,
int (*callback)(int n, const char *buf, void *parameters)); int (*callback)(int n, const char *buf, void *parameters));
#ifdef HAVE_LCD_BITMAP
/* Save a .BMP file containing the current screen contents. */
void screen_dump(void);
void screen_dump_set_hook(void (*hook)(int fh));
#endif
/* Make BMP colour map entries from R, G, B triples, without and with blending.
* Not within HAVE_LCD_BITMAP because it is also used for the Player sim */
#define RED_CMP(c) (((c) >> 16) & 0xff)
#define GREEN_CMP(c) (((c) >> 8) & 0xff)
#define BLUE_CMP(c) ((c) & 0xff)
#define BMP_COLOR(c) BLUE_CMP(c), GREEN_CMP(c), RED_CMP(c), 0
#define BMP_COLOR_MIX(c1, c2, num, den) \
(BLUE_CMP(c2) - BLUE_CMP(c1)) * (num) / (den) + BLUE_CMP(c1), \
(GREEN_CMP(c2) - GREEN_CMP(c1)) * (num) / (den) + GREEN_CMP(c1), \
(RED_CMP(c2) - RED_CMP(c1)) * (num) / (den) + RED_CMP(c1), 0
bool settings_parseline(char* line, char** name, char** value); bool settings_parseline(char* line, char** name, char** value);
long default_event_handler_ex(long event, void (*callback)(void *), void *parameter); long default_event_handler_ex(long event, void (*callback)(void *), void *parameter);
long default_event_handler(long event); long default_event_handler(long event);

1
apps/plugin.h
View file

@ -77,6 +77,7 @@ void* plugin_get_buffer(size_t *buffer_size);
#include "timer.h" #include "timer.h"
#include "playlist.h" #include "playlist.h"
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
#include "screendump.h"
#include "scrollbar.h" #include "scrollbar.h"
#include "../recorder/bmp.h" #include "../recorder/bmp.h"
#endif #endif

5
apps/plugins/lib/grey_core.c
View file

@ -718,12 +718,9 @@ void grey_deferred_lcd_update(void)
#define BMP_BPP 8 #define BMP_BPP 8
#define BMP_LINESIZE ((LCD_WIDTH + 3) & ~3) #define BMP_LINESIZE ((LCD_WIDTH + 3) & ~3)
#define BMP_HEADERSIZE (54 + 4 * BMP_NUMCOLORS) #define BMP_HEADERSIZE (54 + 4 * BMP_NUMCOLORS)
#define BMP_DATASIZE (BMP_LINESIZE * LCD_HEIGHT) #define BMP_DATASIZE (BMP_LINESIZE * (LCD_HEIGHT+LCD_SPLIT_LINES))
#define BMP_TOTALSIZE (BMP_HEADERSIZE + BMP_DATASIZE) #define BMP_TOTALSIZE (BMP_HEADERSIZE + BMP_DATASIZE)
#define LE16_CONST(x) (x)&0xff, ((x)>>8)&0xff
#define LE32_CONST(x) (x)&0xff, ((x)>>8)&0xff, ((x)>>16)&0xff, ((x)>>24)&0xff
static const unsigned char bmpheader[] = static const unsigned char bmpheader[] =
{ {
0x42, 0x4d, /* 'BM' */ 0x42, 0x4d, /* 'BM' */

1
apps/recorder/radio.c
View file

@ -34,6 +34,7 @@
#include "mp3_playback.h" #include "mp3_playback.h"
#include "ctype.h" #include "ctype.h"
#include "file.h" #include "file.h"
#include "general.h"
#include "errno.h" #include "errno.h"
#include "string.h" #include "string.h"
#include "system.h" #include "system.h"

1
apps/recorder/recording.c
View file

@ -77,6 +77,7 @@
#include "sound_menu.h" #include "sound_menu.h"
#include "viewport.h" #include "viewport.h"
#include "list.h" #include "list.h"
#include "general.h"
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING
/* This array holds the record timer interval lengths, in seconds */ /* This array holds the record timer interval lengths, in seconds */

1
apps/settings.c
View file

@ -43,6 +43,7 @@
#include "ctype.h" #include "ctype.h"
#include "file.h" #include "file.h"
#include "system.h" #include "system.h"
#include "general.h"
#include "misc.h" #include "misc.h"
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
#include "icons.h" #include "icons.h"

5
firmware/SOURCES
View file

@ -2,6 +2,7 @@ ata_idle_notify.c
events.c events.c
backlight.c backlight.c
buffer.c buffer.c
general.c
powermgmt.c powermgmt.c
system.c system.c
usb.c usb.c
@ -73,6 +74,9 @@ font_cache.c
font.c font.c
hangul.c hangul.c
lru.c lru.c
#ifndef BOOTLOADER
screendump.c
#endif
#if LCD_DEPTH == 1 #if LCD_DEPTH == 1
drivers/lcd-1bit-vert.c drivers/lcd-1bit-vert.c
#elif LCD_DEPTH == 2 #elif LCD_DEPTH == 2
@ -201,7 +205,6 @@ sound.c
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
#ifndef BOOTLOADER #ifndef BOOTLOADER
general.c
pcm_sampr.c pcm_sampr.c
pcm.c pcm.c
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING

10
firmware/backlight.c
View file

@ -35,6 +35,7 @@
#include "timer.h" #include "timer.h"
#include "backlight.h" #include "backlight.h"
#include "lcd.h" #include "lcd.h"
#include "screendump.h"
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
#include "lcd-remote.h" #include "lcd-remote.h"
@ -57,9 +58,6 @@ int backlight_brightness = DEFAULT_BRIGHTNESS_SETTING;
#include "backlight-sw-fading.h" #include "backlight-sw-fading.h"
#endif #endif
#ifdef SIMULATOR #ifdef SIMULATOR
/* TODO: find a better way to do it but we need a kernel thread somewhere to
handle this */
extern void screen_dump(void);
static inline void _backlight_on(void) static inline void _backlight_on(void)
{ {
@ -600,9 +598,13 @@ void backlight_thread(void)
#endif /* HAVE_REMOTE_LCD/ HAVE_REMOTE_LCD_AS_MAIN */ #endif /* HAVE_REMOTE_LCD/ HAVE_REMOTE_LCD_AS_MAIN */
#endif /* !SIMULATOR */ #endif /* !SIMULATOR */
#ifdef SIMULATOR #ifdef SIMULATOR
/* This one here too for lack of a better place */ /* TODO: find a better way to do it but we need
* a kernel thread somewhere to handle this */
case SYS_SCREENDUMP: case SYS_SCREENDUMP:
screen_dump(); screen_dump();
#ifdef HAVE_REMOTE_LCD
remote_screen_dump();
#endif
break; break;
#endif #endif
case SYS_USB_CONNECTED: case SYS_USB_CONNECTED:

35
firmware/export/general.h
View file

@ -24,7 +24,9 @@
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include "config.h"
#if CONFIG_CODEC == SWCODEC
/* round a signed/unsigned 32bit value to the closest of a list of values */ /* round a signed/unsigned 32bit value to the closest of a list of values */
/* returns the index of the closest value */ /* returns the index of the closest value */
int round_value_to_list32(unsigned long value, int round_value_to_list32(unsigned long value,
@ -36,5 +38,38 @@ int make_list_from_caps32(unsigned long src_mask,
const unsigned long *src_list, const unsigned long *src_list,
unsigned long caps_mask, unsigned long caps_mask,
unsigned long *caps_list); unsigned long *caps_list);
#endif /* CONFIG_CODEC == SWCODEC */
/* Create a filename with a number part in a way that the number is 1
* higher than the highest numbered file matching the same pattern.
* It is allowed that buffer and path point to the same memory location,
* saving a strcpy(). Path must always be given without trailing slash.
*
* "num" can point to an int specifying the number to use or NULL or a value
* less than zero to number automatically. The final number used will also
* be returned in *num. If *num is >= 0 then *num will be incremented by
* one. */
#if defined(HAVE_RECORDING) && (CONFIG_RTC == 0)
/* this feature is needed by recording without a RTC to prevent disk access
when changing files */
#define IF_CNFN_NUM_(...) __VA_ARGS__
#define IF_CNFN_NUM
#else
#define IF_CNFN_NUM_(...)
#endif
char *create_numbered_filename(char *buffer, const char *path,
const char *prefix, const char *suffix,
int numberlen IF_CNFN_NUM_(, int *num));
#if CONFIG_RTC
/* Create a filename with a date+time part.
It is allowed that buffer and path point to the same memory location,
saving a strcpy(). Path must always be given without trailing slash.
unique_time as true makes the function wait until the current time has
changed. */
char *create_datetime_filename(char *buffer, const char *path,
const char *prefix, const char *suffix,
bool unique_time);
#endif /* CONFIG_RTC */
#endif /* GENERAL_H */ #endif /* GENERAL_H */

117
firmware/general.c
View file

@ -18,11 +18,20 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include <limits.h>
#include "system.h"
#include "config.h" #include "config.h"
#include "general.h" #include "general.h"
#include "dir.h"
#include "limits.h"
#include "sprintf.h"
#include "stdlib.h"
#include "string.h"
#include "system.h"
#include "time.h"
#include "timefuncs.h"
#if CONFIG_CODEC == SWCODEC
int round_value_to_list32(unsigned long value, int round_value_to_list32(unsigned long value,
const unsigned long list[], const unsigned long list[],
int count, int count,
@ -78,3 +87,107 @@ int make_list_from_caps32(unsigned long src_mask,
return count; return count;
} /* make_list_from_caps32 */ } /* make_list_from_caps32 */
#endif /* CONFIG_CODEC == SWCODEC */
/* Create a filename with a number part in a way that the number is 1
* higher than the highest numbered file matching the same pattern.
* It is allowed that buffer and path point to the same memory location,
* saving a strcpy(). Path must always be given without trailing slash.
* "num" can point to an int specifying the number to use or NULL or a value
* less than zero to number automatically. The final number used will also
* be returned in *num. If *num is >= 0 then *num will be incremented by
* one. */
char *create_numbered_filename(char *buffer, const char *path,
const char *prefix, const char *suffix,
int numberlen IF_CNFN_NUM_(, int *num))
{
DIR *dir;
struct dirent *entry;
int max_num;
int pathlen;
int prefixlen = strlen(prefix);
char fmtstring[12];
if (buffer != path)
strncpy(buffer, path, MAX_PATH);
pathlen = strlen(buffer);
#ifdef IF_CNFN_NUM
if (num && *num >= 0)
{
/* number specified */
max_num = *num;
}
else
#endif
{
/* automatic numbering */
max_num = 0;
dir = opendir(pathlen ? buffer : "/");
if (!dir)
return NULL;
while ((entry = readdir(dir)))
{
int curr_num;
if (strncasecmp((char *)entry->d_name, prefix, prefixlen)
|| strcasecmp((char *)entry->d_name + prefixlen + numberlen, suffix))
continue;
curr_num = atoi((char *)entry->d_name + prefixlen);
if (curr_num > max_num)
max_num = curr_num;
}
closedir(dir);
}
max_num++;
snprintf(fmtstring, sizeof(fmtstring), "/%%s%%0%dd%%s", numberlen);
snprintf(buffer + pathlen, MAX_PATH - pathlen, fmtstring, prefix,
max_num, suffix);
#ifdef IF_CNFN_NUM
if (num)
*num = max_num;
#endif
return buffer;
}
#if CONFIG_RTC
/* Create a filename with a date+time part.
It is allowed that buffer and path point to the same memory location,
saving a strcpy(). Path must always be given without trailing slash.
unique_time as true makes the function wait until the current time has
changed. */
char *create_datetime_filename(char *buffer, const char *path,
const char *prefix, const char *suffix,
bool unique_time)
{
struct tm *tm = get_time();
static struct tm last_tm;
int pathlen;
while (unique_time && !memcmp(get_time(), &last_tm, sizeof (struct tm)))
sleep(HZ/10);
last_tm = *tm;
if (buffer != path)
strncpy(buffer, path, MAX_PATH);
pathlen = strlen(buffer);
snprintf(buffer + pathlen, MAX_PATH - pathlen,
"/%s%02d%02d%02d-%02d%02d%02d%s", prefix,
tm->tm_year % 100, tm->tm_mon + 1, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec, suffix);
return buffer;
}
#endif /* CONFIG_RTC */

11
firmware/usb.c
View file

@ -42,7 +42,8 @@
#ifdef HAVE_USBSTACK #ifdef HAVE_USBSTACK
#include "usb_core.h" #include "usb_core.h"
#endif #endif
#include "logf.h" #include "logf.h"
#include "screendump.h"
/* Conditions under which we want the entire driver */ /* Conditions under which we want the entire driver */
#if !defined(BOOTLOADER) || (CONFIG_CPU == SH7034) || \ #if !defined(BOOTLOADER) || (CONFIG_CPU == SH7034) || \
@ -55,11 +56,6 @@
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
bool do_screendump_instead_of_usb = false; bool do_screendump_instead_of_usb = false;
#if defined(USB_FULL_INIT) && defined(BOOTLOADER)
static void screen_dump(void) {}
#else
void screen_dump(void); /* Nasty again. Defined in apps/ too */
#endif
#endif #endif
#if !defined(SIMULATOR) && !defined(USB_NONE) #if !defined(SIMULATOR) && !defined(USB_NONE)
@ -262,6 +258,9 @@ static void usb_thread(void)
{ {
usb_state = USB_SCREENDUMP; usb_state = USB_SCREENDUMP;
screen_dump(); screen_dump();
#ifdef HAVE_REMOTE_LCD
remote_screen_dump();
#endif
break; break;
} }
#endif #endif

8
uisimulator/sdl/lcd-bitmap.c
View file

@ -22,7 +22,7 @@
#include "debug.h" #include "debug.h"
#include "uisdl.h" #include "uisdl.h"
#include "lcd-sdl.h" #include "lcd-sdl.h"
#include "misc.h" #include "screendump.h"
SDL_Surface* lcd_surface; SDL_Surface* lcd_surface;
@ -166,14 +166,12 @@ void sim_lcd_init(void)
SIM_LCD_WIDTH * display_zoom, SIM_LCD_WIDTH * display_zoom,
SIM_LCD_HEIGHT * display_zoom, SIM_LCD_HEIGHT * display_zoom,
LCD_DEPTH, 0, 0, 0, 0); LCD_DEPTH, 0, 0, 0, 0);
#else #elif LCD_DEPTH <= 8
lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE,
SIM_LCD_WIDTH * display_zoom, SIM_LCD_WIDTH * display_zoom,
SIM_LCD_HEIGHT * display_zoom, SIM_LCD_HEIGHT * display_zoom,
8, 0, 0, 0, 0); 8, 0, 0, 0, 0);
#endif
#if LCD_DEPTH <= 8
#ifdef HAVE_BACKLIGHT #ifdef HAVE_BACKLIGHT
sdl_set_gradient(lcd_surface, &lcd_bl_color_dark, sdl_set_gradient(lcd_surface, &lcd_bl_color_dark,
&lcd_bl_color_bright, 0, NUM_SHADES); &lcd_bl_color_bright, 0, NUM_SHADES);
@ -189,7 +187,7 @@ void sim_lcd_init(void)
&lcd_color2_bright, NUM_SHADES, NUM_SHADES); &lcd_color2_bright, NUM_SHADES, NUM_SHADES);
#endif #endif
#endif /* !HAVE_BACKLIGHT */ #endif /* !HAVE_BACKLIGHT */
#endif /* LCD_DEPTH < 8 */ #endif /* LCD_DEPTH */
} }
#if LCD_DEPTH < 8 #if LCD_DEPTH < 8

3
uisimulator/sdl/lcd-charcells.c
View file

@ -22,7 +22,8 @@
#include "debug.h" #include "debug.h"
#include "lcd.h" #include "lcd.h"
#include "lcd-charcell.h" #include "lcd-charcell.h"
#include "misc.h" #inclued "screendump.h"
#include "misc.h"
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>

12
uisimulator/sdl/lcd-remote-bitmap.c
View file

@ -22,7 +22,7 @@
#include "uisdl.h" #include "uisdl.h"
#include "lcd-sdl.h" #include "lcd-sdl.h"
#include "lcd-remote-bitmap.h" #include "lcd-remote-bitmap.h"
#include "misc.h" #include "screendump.h"
SDL_Surface *remote_surface; SDL_Surface *remote_surface;
@ -39,7 +39,7 @@ SDL_Color remote_color_bright = {RED_CMP(LCD_REMOTE_BRIGHTCOLOR),
GREEN_CMP(LCD_REMOTE_BRIGHTCOLOR), GREEN_CMP(LCD_REMOTE_BRIGHTCOLOR),
BLUE_CMP(LCD_REMOTE_BRIGHTCOLOR), 0}; BLUE_CMP(LCD_REMOTE_BRIGHTCOLOR), 0};
#define GRADIENT_MAX 128 #define NUM_SHADES 129
#if LCD_REMOTE_DEPTH == 2 #if LCD_REMOTE_DEPTH == 2
/* Only defined for positive, non-split LCD for now */ /* Only defined for positive, non-split LCD for now */
@ -49,7 +49,7 @@ static const unsigned char colorindex[4] = {128, 85, 43, 0};
static unsigned long get_lcd_remote_pixel(int x, int y) static unsigned long get_lcd_remote_pixel(int x, int y)
{ {
#if LCD_REMOTE_DEPTH == 1 #if LCD_REMOTE_DEPTH == 1
return lcd_remote_framebuffer[y/8][x] & (1 << (y & 7)) ? 0 : GRADIENT_MAX; return lcd_remote_framebuffer[y/8][x] & (1 << (y & 7)) ? 0 : (NUM_SHADES-1);
#elif LCD_REMOTE_DEPTH == 2 #elif LCD_REMOTE_DEPTH == 2
#if LCD_REMOTE_PIXELFORMAT == VERTICAL_INTERLEAVED #if LCD_REMOTE_PIXELFORMAT == VERTICAL_INTERLEAVED
unsigned bits = (lcd_remote_framebuffer[y/8][x] >> (y & 7)) & 0x0101; unsigned bits = (lcd_remote_framebuffer[y/8][x] >> (y & 7)) & 0x0101;
@ -76,10 +76,10 @@ void sim_remote_backlight(int value)
{ {
if (value > 0) { if (value > 0) {
sdl_set_gradient(remote_surface, &remote_bl_color_dark, sdl_set_gradient(remote_surface, &remote_bl_color_dark,
&remote_bl_color_bright, 0, GRADIENT_MAX+1); &remote_bl_color_bright, 0, NUM_SHADES);
} else { } else {
sdl_set_gradient(remote_surface, &remote_color_dark, sdl_set_gradient(remote_surface, &remote_color_dark,
&remote_color_bright, 0, GRADIENT_MAX+1); &remote_color_bright, 0, NUM_SHADES);
} }
sdl_gui_update(remote_surface, 0, 0, LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT, sdl_gui_update(remote_surface, 0, 0, LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT,
@ -97,6 +97,6 @@ void sim_lcd_remote_init(void)
8, 0, 0, 0, 0); 8, 0, 0, 0, 0);
sdl_set_gradient(remote_surface, &remote_bl_color_dark, sdl_set_gradient(remote_surface, &remote_bl_color_dark,
&remote_bl_color_bright, 0, GRADIENT_MAX+1); &remote_bl_color_bright, 0, NUM_SHADES);
} }