ErnyTech/Open-USB-Extreme
1
0
Fork 0
mirror of https://github.com/ErnyTech/Open-USB-Extreme synced 2024-10-31 08:42:54 +01:00
Code Issues Releases Wiki Activity

Implemented oueGetName, oueFilename and ouePartSize

Browse Source 
Signed-off-by: Ernesto Castellotti <erny.castell@gmail.com>
This commit is contained in:
Ernesto Castellotti 2019-08-30 22:54:44 +02:00
parent a58b6e9dba
commit 9ed84b569e
5 changed files with 126 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -16,7 +16,7 @@ include_directories(include)
set(CMAKE_D_FLAGS "${CMAKE_D_FLAGS} -betterC -O -release -L-rpath=.")
add_library(generate_header SHARED ${PUB_SOURCES})
target_compile_options (generate_header PRIVATE "-Hd=${CMAKE_SOURCE_DIR}/include")
target_compile_options(generate_header PRIVATE "-Hd=${CMAKE_SOURCE_DIR}/include")
add_library(${PROJECT_NAME} SHARED ${SOURCES})

20
include/usbextreme.di
View File

@ -6,6 +6,11 @@ enum USBEXTREME_ID_LENGTH = 15;
enum USBEXTREME_NAME_EXT_LENGTH = 10;
enum USBEXTREME_MAGIC = 8;
enum USBEXTREME_HEADER_SIZE = UsbExtremeBase.sizeof;
enum USBEXTREME_FILESTAT_NAME_LENGTH = USBEXTREME_NAME_LENGTH + USBEXTREME_NAME_EXT_LENGTH;
enum USBEXTREME_PREFIX = "ul.";
enum USBEXTREME_CRC32_LENGTH = 8;
enum USBEXTREME_FILENAME_LENGTH = USBEXTREME_ID_LENGTH + USBEXTREME_CRC32_LENGTH + 1;
enum USBEXTREME_PART_SIZE_V0 = 1073741824;
align (1) struct UsbExtremeBase
{
align (1)
@ -21,7 +26,7 @@ align (1) struct UsbExtremeV0
{
char[USBEXTREME_NAME_LENGTH] name;
char[USBEXTREME_ID_LENGTH] id;
uint8_t n_parts;
uint8_t parts;
SCECdvdMediaType type;
uint8_t[4] empty;
uint8_t magic;
@ -34,9 +39,9 @@ align (1) struct UsbExtremeV1
{
char[USBEXTREME_NAME_LENGTH] name;
char[USBEXTREME_ID_LENGTH] id;
uint8_t n_parts;
uint8_t parts;
SCECdvdMediaType type;
uint16_t size;
uint16_t partSize;
uint8_t videoMode;
UsbExtremeVersion usbExtremeVersion;
uint8_t magic;
@ -54,9 +59,9 @@ struct UsbExtremeHeaders
struct UsbExtremeFilestat
{
size_t offset;
char[USBEXTREME_NAME_LENGTH + USBEXTREME_NAME_EXT_LENGTH] name;
char[USBEXTREME_FILESTAT_NAME_LENGTH] name;
SCECdvdMediaType type;
uint16_t size;
size_t partSize;
uint8_t videoMode;
UsbExtremeVersion usbExtremeVersion;
}
@ -90,9 +95,14 @@ extern (D) size_t ouePointHeaders(ref const(UsbExtremeBase)[] headers, const(voi
extern (D) UsbExtremeVersion oueHeadersVersion(const(void)[] headers);
extern (D) int oueReadHeaders(ref UsbExtremeHeaders headers, const(void)[] rawHeaders);
extern (D) UsbExtremeFilestat[] oueRead(UsbExtremeFilestat[] filestats, const(UsbExtremeHeaders) headers);
extern (D) void oueGetName(char[] dest, const(UsbExtremeHeaders) headers, size_t offset);
extern (D) char[] oueFilename(char[] buffer, const(UsbExtremeHeaders) headers, size_t offset);
extern (D) size_t ouePartSize(const(UsbExtremeHeaders) headers, size_t offset);
private R[] castArray(R, T)(T[] array)
{
auto ptr = array.ptr;
auto castPtr = cast(R*)ptr;
return castPtr[0..array.length * T.sizeof / R.sizeof];
}
__gshared uint[1024] crcTable;
private uint crc32(char[] name);

18
include/usbextreme.h
View File

@ -15,6 +15,12 @@
#define USBEXTREME_ID_LENGTH 15
#define USBEXTREME_NAME_EXT_LENGTH 10
#define USBEXTREME_MAGIC 0x08
#define USBEXTREME_FILESTAT_NAME_LENGTH USBEXTREME_NAME_LENGTH + USBEXTREME_NAME_EXT_LENGTH
#define USBEXTREME_PREFIX "ul."
#define USBEXTREME_CRC32_LENGTH 8
#define USBEXTREME_FILENAME_LENGTH USBEXTREME_ID_LENGTH + USBEXTREME_CRC32_LENGTH + 1
#define USBEXTREME_PART_SIZE = 0x40000000
typedef enum {
SCECdGDTFUNCFAIL = -1,
@ -72,11 +78,13 @@ typedef struct __attribute__((__packed__)) {
typedef struct {
size_t offset;
char name[USBEXTREME_NAME_LENGTH + USBEXTREME_NAME_EXT_LENGTH];
char name[USBEXTREME_FILESTAT_NAME_LENGTH];
SCECdvdMediaType type;
u16 size;
size_t size;
u8 video_mode;
usb_extreme_versions usb_extreme_version;
char filename[USBEXTREME_FILENAME_LENGTH];
u8 parts;
} usb_extreme_filestat;
typedef struct {
@ -100,6 +108,12 @@ int oue_read_headers(usb_extreme_headers *headers, void *raw_headers, const size
/* Read functions */
size_t oue_read(usb_extreme_filestat *filestats, const usb_extreme_headers headers, const int filestats_nlen);
void oue_get_name(char *dest, size_t length, const usb_extreme_headers headers, size_t offset);
void oue_filename(char *buffer, size_t length, const usb_extreme_headers headers, size_t offset);
size_t oue_part_size(const usb_extreme_headers headers, size_t offset);
/* implementation in development
*
int oue_add(usb_extreme_headers *headers, const usb_extreme_filestat filestat);

12
lib/cabi.d
View File

@ -41,3 +41,15 @@ extern(C) size_t oue_read(UsbExtremeFilestat* filestat, const(UsbExtremeHeaders)
auto result = oueRead(filestat[0..filestatsLen], headers);
return result.length;
}
extern(C) void oue_get_name(char* dest, size_t length, const(UsbExtremeHeaders) headers, size_t offset) {
oueGetName(dest[0..length], headers, offset);
}
extern(C) void oue_filename(char* buffer, size_t length, const(UsbExtremeHeaders) headers, size_t offset) {
oueFilename(buffer[0..length], headers, offset);
}
extern(C) size_t oue_part_size(const(UsbExtremeHeaders) headers, size_t offset) {
return ouePartSize(headers, offset);
}

94
lib/usbextreme.d
View File

@ -6,6 +6,11 @@ enum USBEXTREME_ID_LENGTH = 15;
enum USBEXTREME_NAME_EXT_LENGTH = 10;
enum USBEXTREME_MAGIC = 0x08;
enum USBEXTREME_HEADER_SIZE = UsbExtremeBase.sizeof;
enum USBEXTREME_FILESTAT_NAME_LENGTH = USBEXTREME_NAME_LENGTH + USBEXTREME_NAME_EXT_LENGTH;
enum USBEXTREME_PREFIX = "ul.";
enum USBEXTREME_CRC32_LENGTH = 8;
enum USBEXTREME_FILENAME_LENGTH = USBEXTREME_ID_LENGTH + USBEXTREME_CRC32_LENGTH + 1;
enum USBEXTREME_PART_SIZE_V0 = 0x40000000;
align(1) struct UsbExtremeBase {
align(1):
@ -18,7 +23,7 @@ align(1) struct UsbExtremeV0 {
align(1):
char[USBEXTREME_NAME_LENGTH] name;
char[USBEXTREME_ID_LENGTH] id;
uint8_t n_parts;
uint8_t parts;
SCECdvdMediaType type;
uint8_t[4] empty;
uint8_t magic;
@ -29,9 +34,9 @@ align(1) struct UsbExtremeV1 {
align(1):
char[USBEXTREME_NAME_LENGTH] name;
char[USBEXTREME_ID_LENGTH] id;
uint8_t n_parts;
uint8_t parts;
SCECdvdMediaType type;
uint16_t size;
uint16_t partSize;
uint8_t videoMode;
UsbExtremeVersion usbExtremeVersion;
uint8_t magic;
@ -48,9 +53,9 @@ struct UsbExtremeHeaders {
struct UsbExtremeFilestat {
size_t offset;
char[USBEXTREME_NAME_LENGTH + USBEXTREME_NAME_EXT_LENGTH] name;
char[USBEXTREME_FILESTAT_NAME_LENGTH] name;
SCECdvdMediaType type;
uint16_t size;
size_t partSize;
uint8_t videoMode;
UsbExtremeVersion usbExtremeVersion;
}
@ -182,18 +187,16 @@ extern(D) UsbExtremeFilestat[] oueRead(UsbExtremeFilestat[] filestats, const(Usb
}
auto header = headersFull[i];
filestat.name[0..USBEXTREME_NAME_LENGTH] = header.name[0..$];
oueGetName(filestat.name, headers, i);
auto headerVersion = getVersion(header.usbExtremeVersion);
uint16_t size = 0;
auto partSize = ouePartSize(headers, i);
uint8_t videoMode = 0;
if (headerVersion >= 1) {
size = header.size;
videoMode = header.videoMode;
filestat.name[USBEXTREME_NAME_LENGTH..USBEXTREME_NAME_LENGTH + USBEXTREME_NAME_EXT_LENGTH] = header.nameExt[0..$];
}
filestat.size = size;
}
filestat.partSize = partSize;
filestat.type = header.type;
filestat.offset = i;
filestat.videoMode = videoMode;
@ -205,8 +208,75 @@ extern(D) UsbExtremeFilestat[] oueRead(UsbExtremeFilestat[] filestats, const(Usb
return filestats[0..fileStatsLength];
}
extern(D) void oueGetName(char[] dest, const(UsbExtremeHeaders) headers, size_t offset) {
auto headersFull = castArray!(UsbExtremeV1)(headers.headers);
auto header = headersFull[offset];
auto headerVersion = getVersion(header.usbExtremeVersion);
dest[0..USBEXTREME_NAME_LENGTH] = header.name[0..$];
if (headerVersion >= 1) {
dest[USBEXTREME_NAME_LENGTH..USBEXTREME_NAME_LENGTH + USBEXTREME_NAME_EXT_LENGTH] = header.nameExt[0..$];
}
}
extern(D) char[] oueFilename(char[] buffer, const(UsbExtremeHeaders) headers, size_t offset) {
import core.stdc.stdio : snprintf;
char[USBEXTREME_FILESTAT_NAME_LENGTH] name;
auto headersFull = castArray!(UsbExtremeV1)(headers.headers);
auto header = headersFull[offset];
auto startupId = header.id[3..$];
oueGetName(name, headers, offset);
auto crc = crc32(name);
snprintf(buffer.ptr, buffer.length, "%s%08X.%s", USBEXTREME_PREFIX.ptr, crc, startupId.ptr);
return buffer;
}
extern(D) size_t ouePartSize(const(UsbExtremeHeaders) headers, size_t offset) {
auto headersFull = castArray!(UsbExtremeV1)(headers.headers);
auto header = headersFull[offset];
auto headerVersion = getVersion(header.usbExtremeVersion);
if (headerVersion >= 1) {
return header.partSize * (2 ^^ 20);
} else {
return USBEXTREME_PART_SIZE_V0;
}
}
private R[] castArray(R, T) (T[] array) { // Workaround for https://issues.dlang.org/show_bug.cgi?id=20088
auto ptr = array.ptr;
auto castPtr = cast(R*) ptr;
return castPtr[0..((array.length * T.sizeof) / R.sizeof)];
}
__gshared uint[1024] crcTable;
private uint crc32(char[] name) {
int crc;
int count;
foreach (table; 0 .. 256) {
crc = table << 24;
for (count = 8; count > 0; count--) {
if (crc < 0) {
crc = crc << 1;
} else {
crc = (crc << 1) ^ 0x04C11DB7;
}
}
crcTable[255 - table] = crc;
}
do {
auto singleChar = name[count++];
crc = crcTable[singleChar ^ ((crc >> 24) & 0xFF)] ^ ((crc << 8) & 0xFFFFFF00);
} while (name[count - 1] != 0);
return crc;
}