mirror of
https://github.com/Martin-P/OpenV2G.git
synced 2024-11-28 13:07:38 +00:00
ByteStream included
BitStream removed
This commit is contained in:
parent
c79ced3d2e
commit
86d465865b
2 changed files with 12 additions and 34 deletions
|
@ -33,13 +33,12 @@
|
|||
|
||||
#include "EXITypes.h"
|
||||
|
||||
#ifndef BIT_STREAM_C
|
||||
#define BIT_STREAM_C
|
||||
#ifndef BYTE_STREAM_C
|
||||
#define BYTE_STREAM_C
|
||||
|
||||
int toBitstream(const char * filename, bitstream_t* bitstream) {
|
||||
int readBytesFromFile(const char * filename, uint8_t* data, size_t size, size_t pos) {
|
||||
FILE* f;
|
||||
int character;
|
||||
size_t len = 0, pos = 0, i;
|
||||
|
||||
f = fopen(filename, "rb");
|
||||
|
||||
|
@ -47,32 +46,18 @@ int toBitstream(const char * filename, bitstream_t* bitstream) {
|
|||
printf("\n[Error] no valid file handle !\n");
|
||||
return -1;
|
||||
} else {
|
||||
/* detect file size */
|
||||
/* read bytes */
|
||||
while ((character = getc(f)) != EOF) {
|
||||
if (pos >= size) {
|
||||
return -1;
|
||||
}
|
||||
data[pos++] = (uint8_t) character;
|
||||
/* printf("%u \n", character); */
|
||||
len++;
|
||||
}
|
||||
fclose(f);
|
||||
/* printf("%u Zeichen", len); */
|
||||
|
||||
/* setup stream */
|
||||
bitstream->data = malloc(sizeof(uint8_t) * len);
|
||||
bitstream->size = len;
|
||||
bitstream->pos = &pos;
|
||||
bitstream->buffer = 0;
|
||||
bitstream->capacity = 8;
|
||||
|
||||
/* read file byte per byte */
|
||||
f = fopen(filename, "rb");
|
||||
i = 0;
|
||||
while ((character = getc(f)) != EOF) {
|
||||
bitstream->data[i] = (uint8_t) character;
|
||||
i++;
|
||||
}
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return pos;
|
||||
}
|
||||
|
||||
int writeBytesToFile(uint8_t* data, size_t len, const char * filename) {
|
||||
|
@ -93,11 +78,6 @@ int writeBytesToFile(uint8_t* data, size_t len, const char * filename) {
|
|||
}
|
||||
}
|
||||
|
||||
int writeBitstreamToFile(bitstream_t* bitsream, const char * filename) {
|
||||
return writeBytesToFile(bitsream->data, bitsream->size, filename);
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -31,14 +31,12 @@ extern "C" {
|
|||
|
||||
#include "EXITypes.h"
|
||||
|
||||
#ifndef BIT_STREAM_H
|
||||
#define BIT_STREAM_H
|
||||
#ifndef BYTE_STREAM_H
|
||||
#define BYTE_STREAM_H
|
||||
|
||||
int writeBytesToFile(uint8_t* data, size_t len, const char * filename);
|
||||
|
||||
int writeBitstreamToFile(bitstream_t* bitsream, const char * filename);
|
||||
|
||||
int toBitstream(const char * filename, bitstream_t* bitstream);
|
||||
int readBytesFromFile(const char * filename, uint8_t* data, size_t size, size_t pos);
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in a new issue