URL
https://opencores.org/ocsvn/eco32/eco32/trunk
Subversion Repositories eco32
Compare Revisions
- This comparison shows the changes necessary to convert path
/eco32
- from Rev 257 to Rev 258
- ↔ Reverse comparison
Rev 257 → Rev 258
/trunk/disk/tools/mkdata/Makefile
4,7 → 4,7
|
BUILD = ../../../build |
|
CC = gcc -m32 |
CC = gcc |
CFLAGS = -g -Wall |
|
.PHONY: all install clean |
/trunk/disk/tools/shpart/shpart.c
15,9 → 15,9
|
|
typedef struct { |
unsigned long type; |
unsigned long start; |
unsigned long size; |
unsigned int type; |
unsigned int start; |
unsigned int size; |
char descr[DESCR_SIZE]; |
} PartEntry; |
|
42,11 → 42,11
/**************************************************************/ |
|
|
unsigned long getNumber(unsigned char *p) { |
return (unsigned long) *(p + 0) << 24 | |
(unsigned long) *(p + 1) << 16 | |
(unsigned long) *(p + 2) << 8 | |
(unsigned long) *(p + 3) << 0; |
unsigned int getNumber(unsigned char *p) { |
return (unsigned int) *(p + 0) << 24 | |
(unsigned int) *(p + 1) << 16 | |
(unsigned int) *(p + 2) << 8 | |
(unsigned int) *(p + 3) << 0; |
} |
|
|
70,8 → 70,8
char *diskName; |
FILE *disk; |
unsigned long diskSize; |
unsigned long numSectors; |
unsigned long partLast; |
unsigned int numSectors; |
unsigned int partLast; |
int i, j; |
char c; |
|
90,7 → 90,7
diskSize = ftell(disk); |
numSectors = diskSize / SECTOR_SIZE; |
fclose(disk); |
printf("Disk '%s' has %lu (0x%lX) sectors.\n", |
printf("Disk '%s' has %u (0x%X) sectors.\n", |
diskName, numSectors, numSectors); |
if (numSectors < 32) { |
error("disk is too small"); |
118,7 → 118,7
} else { |
partLast = 0; |
} |
printf("%2d %s 0x%08lX 0x%08lX 0x%08lX 0x%08lX ", |
printf("%2d %s 0x%08X 0x%08X 0x%08X 0x%08X ", |
i, |
ptr[i].type & 0x80000000 ? "*" : " ", |
ptr[i].type & 0x7FFFFFFF, |
/trunk/disk/tools/shpart/Makefile
4,7 → 4,7
|
BUILD = ../../../build |
|
CC = gcc -m32 |
CC = gcc |
CFLAGS = -g -Wall |
LDFLAGS = -g |
LDLIBS = -lm |
/trunk/disk/tools/mkdisk/Makefile
4,7 → 4,7
|
BUILD = ../../../build |
|
CC = gcc -m32 |
CC = gcc |
CFLAGS = -g -Wall |
LDFLAGS = -g |
LDLIBS = -lm |
/trunk/disk/tools/mkmboot/stage2/mboot.c
23,9 → 23,9
|
|
typedef struct { |
unsigned long type; |
unsigned long start; |
unsigned long size; |
unsigned int type; |
unsigned int start; |
unsigned int size; |
char descr[DESCR_SIZE]; |
} PartEntry; |
|
/trunk/disk/tools/mkpart/mkpart.c
20,9 → 20,9
|
|
typedef struct { |
unsigned long type; |
unsigned long start; |
unsigned long size; |
unsigned int type; |
unsigned int start; |
unsigned int size; |
char descr[DESCR_SIZE]; |
} PartEntry; |
|
47,7 → 47,7
/**************************************************************/ |
|
|
void convertNumber(unsigned char *p, unsigned long val) { |
void convertNumber(unsigned char *p, unsigned int val) { |
*(p + 0) = val >> 24; |
*(p + 1) = val >> 16; |
*(p + 2) = val >> 8; |
71,10 → 71,10
/**************************************************************/ |
|
|
int parseNumber(char **pc, unsigned long *pi) { |
int parseNumber(char **pc, unsigned int *pi) { |
char *p; |
unsigned int base, dval; |
unsigned long n; |
unsigned int n; |
|
p = *pc; |
while (*p == ' ' || *p == '\t') { |
163,7 → 163,7
FILE *disk; |
FILE *conf; |
unsigned long diskSize; |
unsigned long numSectors; |
unsigned int numSectors; |
char line[LINE_SIZE]; |
char *p, *q; |
int lineNumber; |
170,12 → 170,12
FILE *mbootblk; |
long mbootblkSize; |
int i; |
unsigned long partNum; |
unsigned long bootable; |
unsigned long partType; |
unsigned long partStart; |
unsigned long partLast; |
unsigned long partSize; |
unsigned int partNum; |
unsigned int bootable; |
unsigned int partType; |
unsigned int partStart; |
unsigned int partLast; |
unsigned int partSize; |
char descr[LINE_SIZE]; |
|
/* check command line arguments */ |
194,7 → 194,7
diskSize = ftell(disk); |
numSectors = diskSize / SECTOR_SIZE; |
fclose(disk); |
printf("Disk '%s' has %lu (0x%lX) sectors.\n", |
printf("Disk '%s' has %u (0x%X) sectors.\n", |
diskName, numSectors, numSectors); |
if (numSectors < 32) { |
error("disk is too small"); |
335,7 → 335,7
} else { |
partLast = 0; |
} |
printf("%2lu %s 0x%08lX 0x%08lX 0x%08lX 0x%08lX %s\n", |
printf("%2u %s 0x%08X 0x%08X 0x%08X 0x%08X %s\n", |
partNum, |
ptr[partNum].type & 0x80000000 ? "*" : " ", |
ptr[partNum].type & 0x7FFFFFFF, |
/trunk/disk/tools/mkpart/Makefile
4,7 → 4,7
|
BUILD = ../../../build |
|
CC = gcc -m32 |
CC = gcc |
CFLAGS = -g -Wall |
LDFLAGS = -g |
LDLIBS = -lm |
/trunk/disk/diskserv/Makefile
13,7 → 13,7
cp diskserv $(BUILD)/bin |
|
diskserv: diskserv.c |
gcc -m32 -g -Wall -o diskserv diskserv.c |
gcc -g -Wall -o diskserv diskserv.c |
|
clean: |
rm -f *~ diskserv |