sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix clang warnings in boot (edparams)

Browse source 
. add missing prototypes for recently added functions.
This commit is contained in:
Antoine Leca 2011-06-23 13:41:50 +02:00 committed by Ben Gras
parent 6edbcbf9a3
commit 3b82f9106d
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boot/boot.h
View file

@ -151,8 +151,14 @@ void bootstrap(int device, struct part_entry *entry);
void minix(u32_t koff, u32_t kcs, u32_t kds, void minix(u32_t koff, u32_t kcs, u32_t kds,
char *bootparams, size_t paramsize, u32_t aout); char *bootparams, size_t paramsize, u32_t aout);
/* Start Minix. */ /* Start Minix. */
void int15(bios_env_t *);
void int15(bios_env_t *);
/* Do an "INT 15" call, primarily for APM. */
void scan_keyboard(void);
/* Read keyboard character.
* Needs to be done in case one is waiting. */
void reset(void);
/* */
/* Shared between boot.c and bootimage.c: */ /* Shared between boot.c and bootimage.c: */

15
boot/boot/boot.c
View file

@ -265,7 +265,7 @@ int rwsectors(int rw, void *addr, u32_t sec, int nsec)
#define writesectors(a, s, n) rwsectors(1, (a), (s), (n)) #define writesectors(a, s, n) rwsectors(1, (a), (s), (n))
#define readerr(sec, err) (errno= (err), report(bootdev.name)) #define readerr(sec, err) (errno= (err), report(bootdev.name))
#define writerr(sec, err) (errno= (err), report(bootdev.name)) #define writerr(sec, err) (errno= (err), report(bootdev.name))
#define putch(c) putchar(c) #define putch(c) (void)putchar(c)
#define unix_err(err) strerror(err) #define unix_err(err) strerror(err)
void readblock(off_t blk, char *buf, int block_size) void readblock(off_t blk, char *buf, int block_size)
@ -333,7 +333,7 @@ int getch(void)
#define clear_screen() printf("[clear]") #define clear_screen() printf("[clear]")
#define boot_device(device) printf("[boot %s]\n", device) #define boot_device(device) printf("[boot %s]\n", device)
#define ctty(line) printf("[ctty %s]\n", line) #define ctty(line) printf("[ctty %s]\n", line)
#define bootminix() (run_trailer() && printf("[boot]\n")) #define bootminix() (void)(run_trailer() && printf("[boot]\n"))
#define off() printf("[off]") #define off() printf("[off]")
#endif /* UNIX */ #endif /* UNIX */
@ -939,7 +939,9 @@ static void get_parameters(void)
{ {
char params[SECTOR_SIZE + 1]; char params[SECTOR_SIZE + 1];
token **acmds; token **acmds;
int r, processor; int r;
#if BIOS
int processor;
memory *mp; memory *mp;
static char bus_type[][4] = { static char bus_type[][4] = {
"xt", "at", "mca" "xt", "at", "mca"
@ -950,6 +952,7 @@ static void get_parameters(void)
static char vid_chrome[][6] = { static char vid_chrome[][6] = {
"mono", "color" "mono", "color"
}; };
#endif
/* Variables that Minix needs: */ /* Variables that Minix needs: */
b_setvar(E_SPECIAL|E_VAR|E_DEV, "rootdev", "ram"); b_setvar(E_SPECIAL|E_VAR|E_DEV, "rootdev", "ram");
@ -1491,7 +1494,7 @@ static void ctty(char *line)
printf("No serial line support under DOS\n"); printf("No serial line support under DOS\n");
} }
reset() static void reset(void)
{ {
printf("No reset support under DOS\n"); printf("No reset support under DOS\n");
} }
@ -1686,7 +1689,7 @@ void help(void)
static void execute(void) static void execute(void)
/* Get one command from the command chain and execute it. */ /* Get one command from the command chain and execute it. */
{ {
token *second, *third, *fourth, *sep; token *second, *third=nil, *fourth=nil, *sep;
char *name; char *name;
enum resnames res; enum resnames res;
size_t n= 0; size_t n= 0;
@ -2065,7 +2068,7 @@ int main(int argc, char **argv)
return 0; return 0;
} }
reset() { } void reset(void) { }
#endif /* UNIX */ #endif /* UNIX */