Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow pifiles to be writable in the DOM2 area #631

Open
wants to merge 2 commits into
base: unstable
Choose a base branch
from
Open

Allow pifiles to be writable in the DOM2 area #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b963c9
Allow pifiles to be writable in the DOM2 area
nopjne Oct 21, 2024
bdaecb9
Prevent access violations and logic errors when buffers get reallocat…
nopjne Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/audio/samplebuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ void* samplebuffer_get(samplebuffer_t *buf, int wpos, int *wlen) {
if ((buf->wpos << bps) & 1) {
buf->wpos--; len++;
}
buf->wv_read(buf->wv_ctx, buf, buf->wpos, ROUNDUP8_BPS(len, bps), seeking);
if (buf->wv_read) {
buf->wv_read(buf->wv_ctx, buf, buf->wpos, ROUNDUP8_BPS(len, bps), seeking);
}
buf->wnext = buf->wpos + buf->widx;
} else {
// Record first sample that we still need to keep in the sample
Expand All @@ -116,12 +118,14 @@ void* samplebuffer_get(samplebuffer_t *buf, int wpos, int *wlen) {
if (reuse < *wlen) {
tracef("samplebuffer_get: read missing: reuse=%x wpos=%x wlen=%x\n", reuse, wpos, *wlen);
assertf(wpos+reuse == buf->wnext, "wpos:%x reuse:%x buf->wnext:%x", wpos, reuse, buf->wnext);
buf->wv_read(buf->wv_ctx, buf, wpos+reuse, ROUNDUP8_BPS(*wlen-reuse, bps), false);
if (buf->wv_read) {
buf->wv_read(buf->wv_ctx, buf, wpos+reuse, ROUNDUP8_BPS(*wlen-reuse, bps), false);
}
buf->wnext = buf->wpos + buf->widx;
}
}

assertf(wpos >= buf->wpos && wpos < buf->wpos+buf->widx,
assertf((wpos >= buf->wpos && wpos < buf->wpos+buf->widx) || (buf->wv_read == NULL),
"samplebuffer_get: logic error\n"
"wpos:%x buf->wpos:%x buf->widx:%x", wpos, buf->wpos, buf->widx);

Expand Down
48 changes: 43 additions & 5 deletions src/pifile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ typedef struct {

static void *__pifile_open(char *name, int flags)
{
if (flags != O_RDONLY) {
errno = EACCES;
return NULL;
}

// Parse the name in the foramt "ADDR:SIZE" as hexdecimal numbers
char *end;
uint32_t base = strtoul(name, &end, 16);
Expand All @@ -42,6 +37,13 @@ static void *__pifile_open(char *name, int flags)
return NULL;
}

if ((base < 0x08000000) || (base >= 0x09000000)) {
if (flags != O_RDONLY) {
errno = EACCES;
return NULL;
}
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need this at this level. In general any device can expose any writeable area at any PI address, so I wouldn't hardcode the range. Eg: many flashcarts allow to write the internal SDRAM by writing at 0x10000000, maybe after enabling writes with some register.

So I would just remove the check and let the user know what they are doing.

pifile_t *file = malloc(sizeof(pifile_t));
if (!file) {
errno = ENOMEM;
Expand Down Expand Up @@ -123,6 +125,41 @@ static int __pifile_read(void *file, uint8_t *buf, int len)
return len;
}


static int __pifile_write(void *file, uint8_t *buf, int len)
{
pifile_t *f = file;
if (f->ptr + len > f->size)
len = f->size - f->ptr;
if (len <= 0)
return 0;

// Check if we can DMA directly to the output buffer
if ((((f->base + f->ptr) ^ (uint32_t)buf) & 1) == 0) {
data_cache_hit_writeback_invalidate(buf, len);
dma_write_raw_async(buf, f->base + f->ptr, len);
dma_wait();
f->ptr += len;
} else {
// Go through a temporary buffer
uint8_t *tmp = alloca(512+1);
if ((f->base + f->ptr) & 1) tmp++;

while (len > 0) {
int n = len > 512 ? 512 : len;
data_cache_hit_writeback_invalidate(tmp, n);
dma_write_raw_async(tmp, f->base + f->ptr, n);
dma_wait();
memcpy(buf, tmp, n);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems wrong, seems like you haven't updated this code.

buf += n;
f->ptr += n;
len -= n;
}
}

return len;
}

static int __pifile_close(void *file)
{
free(file);
Expand All @@ -135,6 +172,7 @@ static filesystem_t pifile_fs = {
.lseek = __pifile_lseek,
.read = __pifile_read,
.close = __pifile_close,
.write = __pifile_write,
};

void pifile_init(void)
Expand Down