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

Remove structec API from talk.c

Browse source 
Change-Id: I6e3bae2a893c932b67b4b5a7c4bf46060e5dc32a
This commit is contained in:
Aidan MacDonald 2022-12-01 01:03:22 +00:00
parent 1131320d48
commit 18fc68401c
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
apps/talk.c
View file

@ -41,7 +41,6 @@
/*#define LOGF_ENABLE*/ /*#define LOGF_ENABLE*/
#include "logf.h" #include "logf.h"
#include "bitswap.h" #include "bitswap.h"
#include "structec.h"
#include "plugin.h" /* plugin_get_buffer() */ #include "plugin.h" /* plugin_get_buffer() */
#include "debug.h" #include "debug.h"
#include "panic.h" #include "panic.h"
@ -502,23 +501,24 @@ static bool load_index_table(int fd, const struct voicefile_header *hdr)
return false; return false;
ret = read_to_handle(fd, index_handle, 0, alloc_size); ret = read_to_handle(fd, index_handle, 0, alloc_size);
if (ret != alloc_size)
if (ret == alloc_size)
{ {
#ifdef ROCKBOX_LITTLE_ENDIAN
struct clip_entry *buf;
buf = core_get_data(index_handle);
for (int i = 0; i < hdr->id1_max + hdr->id2_max; i++)
{
/* doesn't yield() */
structec_convert(&buf[i], "ll", 1, true);
}
#endif
}
else
index_handle = core_free(index_handle); index_handle = core_free(index_handle);
return false;
}
return ret == alloc_size; #ifdef ROCKBOX_LITTLE_ENDIAN
struct clip_entry *buf, *end;
buf = core_get_data(index_handle);
end = buf + hdr->id1_max + hdr->id2_max;
for (; buf != end; buf++)
{
buf->offset = swap32(buf->offset);
buf->size = swap32(buf->size);
}
#endif
return true;
} }
static bool load_header(int fd, struct voicefile_header *hdr) static bool load_header(int fd, struct voicefile_header *hdr)
@ -528,8 +528,11 @@ static bool load_header(int fd, struct voicefile_header *hdr)
return false; return false;
#ifdef ROCKBOX_LITTLE_ENDIAN #ifdef ROCKBOX_LITTLE_ENDIAN
logf("Byte swapping voice file"); hdr->version = swap32(hdr->version);
structec_convert(&voicefile, "lllll", 1, true); hdr->target_id = swap32(hdr->target_id);
hdr->table = swap32(hdr->table);
hdr->id1_max = swap32(hdr->id1_max);
hdr->id2_max = swap32(hdr->id2_max);
#endif #endif
return true; return true;
} }