izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-02 04:20:55 +11:00
Code Issues Releases Wiki Activity

Compare commits

base: izaya:48f371d380e07ba29b1ed7fce09ae4906eef4e78
Branches Tags
izaya:master
izaya:z80asm
izaya:wip
izaya:forth
..
compare: izaya:a36db99651d970ef575b0f0b22dfc50fb2d7a29a
Branches Tags
izaya:master
izaya:z80asm
izaya:wip
izaya:forth

No commits in common. "48f371d380e07ba29b1ed7fce09ae4906eef4e78" and "a36db99651d970ef575b0f0b22dfc50fb2d7a29a" have entirely different histories.
48f371d380 ... a36db99651

2 changed files with 3 additions and 7 deletions
Show Stats Expand all files Collapse all files

7
emul/emul.c
View File

@ -86,13 +86,6 @@ Machine* emul_init()
fprintf(stderr, "Can't open\n"); fprintf(stderr, "Can't open\n");
return NULL; return NULL;
} }
fseek(blkfp, 0, SEEK_END);
if (ftell(blkfp) < 100 * 1024) {
fclose(blkfp);
fprintf(stderr, "emul/blkfs too small, something's wrong, aborting.\n");
return NULL;
}
fseek(blkfp, 0, SEEK_SET);
// initialize memory // initialize memory
memset(m.mem, 0, 0x10000); memset(m.mem, 0, 0x10000);
FILE *bfp = fopen(FBIN_PATH, "r"); FILE *bfp = fopen(FBIN_PATH, "r");

3
tools/blkpack.c
View File

@ -29,6 +29,9 @@ int main(int argc, char *argv[])
if ((strcmp(ep->d_name, ".") == 0) || strcmp(ep->d_name, "..") == 0) { if ((strcmp(ep->d_name, ".") == 0) || strcmp(ep->d_name, "..") == 0) {
continue; continue;
} }
if (ep->d_type != DT_REG) {
continue;
}
int blkid = atoi(ep->d_name); int blkid = atoi(ep->d_name);
if (blkid >= blkcnt) { if (blkid >= blkcnt) {
int newcnt = blkid+1; int newcnt = blkid+1;