projects
/
emu8051.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for bits per row in config file
[emu8051.git]
/
src
/
emuconsole.c
diff --git
a/src/emuconsole.c
b/src/emuconsole.c
index
b8c3bc3
..
3dcdf89
100644
(file)
--- a/
src/emuconsole.c
+++ b/
src/emuconsole.c
@@
-33,6
+33,8
@@
#include "hexfile.h"
#include "keyboard.h"
#include "hexfile.h"
#include "keyboard.h"
+extern struct options_t options;
+
/* Capitalize all letters in buffer */
static void
Capitalize(char *buffer)
/* Capitalize all letters in buffer */
static void
Capitalize(char *buffer)
@@
-60,7
+62,6
@@
RemoveSpaces(char *buffer)
static void
console_exec(char *Address, char *NumberInst)
{
static void
console_exec(char *Address, char *NumberInst)
{
- char dummy;
int NbInst = -1; /* -1 is infinity */
if (strlen(Address) == 0) {
printf("Invalid address\n");
int NbInst = -1; /* -1 is infinity */
if (strlen(Address) == 0) {
printf("Invalid address\n");
@@
-83,7
+84,7
@@
console_exec(char *Address, char *NumberInst)
NbInst--;
} while (!IsBreakpoint(cpu8051.pc) && (NbInst != 0) && !kbhit());
if (kbhit()) {
NbInst--;
} while (!IsBreakpoint(cpu8051.pc) && (NbInst != 0) && !kbhit());
if (kbhit()) {
-
dummy =
getch(); /* Flush key */
+
(void)
getch(); /* Flush key */
printf("Caught break signal!\n");
}
if (NbInst == 0)
printf("Caught break signal!\n");
}
if (NbInst == 0)
@@
-256,7
+257,6
@@
console_main(void)
while (!QuitRequest) {
int slen;
size_t len = 0;
while (!QuitRequest) {
int slen;
size_t len = 0;
- ssize_t bytes_read;
char Command[256];
char Args[256];
char Parameter1[256];
char Command[256];
char Args[256];
char Parameter1[256];
@@
-266,7
+266,7
@@
console_main(void)
Parameter2[0] = '\0';
printf(prompt);
Parameter2[0] = '\0';
printf(prompt);
-
bytes_read =
getline(&line, &len, stdin);
+
(void)
getline(&line, &len, stdin);
Capitalize(line);
RemoveSpaces(line);
Capitalize(line);
RemoveSpaces(line);
@@
-453,22
+453,16
@@
TooMuchParameters:
int
main(int argc, char **argv)
{
int
main(int argc, char **argv)
{
- char *hex_file;
-
- ParseCommandLineOptions(argc, argv);
+ parse_command_line_options(argc, argv);
cpu8051_init();
cpu8051_init();
- hex_file = get_hex_filename();
-
- if (hex_file != NULL)
- LoadHexFile(hex_file);
+ if (options.filename != NULL)
+ LoadHexFile(options.filename);
console_main();
console_main();
-#ifdef EMU8051_DEBUG
- printf("End of program.\n");
-#endif
+ log_info("Terminate");
return 0;
}
return 0;
}