Misc fixes to libc, added ISADMA to core Makefile.cfg

diff --git a/Makefile b/Makefile
index c5d2c29..f7f5928 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -54,39 +54,39 @@ install:    install-Filesystem $(INSTALL_DYNMODS) $(INSTALL_MODULES) install-Kernel
 
 # Compile Only
 $(ALL_DYNMODS): all-%:
-       @echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all -C Modules/$*
+       +@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all -C Modules/$*
 $(ALL_MODULES): all-%:
-       @echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all -C Modules/$*
+       +@echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all -C Modules/$*
 all-Kernel:
-       @echo === Kernel && $(SUBMAKE) all -C Kernel
+       +@echo === Kernel && $(SUBMAKE) all -C Kernel
 $(ALL_USRLIBS): all-%:
-       @echo === User Library: $* && $(SUBMAKE) all -C Usermode/Libraries/$*_src
+       +@echo === User Library: $* && $(SUBMAKE) all -C Usermode/Libraries/$*_src
 $(ALL_USRAPPS): all-%:
-       @echo === User Application: $* && $(SUBMAKE) all -C Usermode/Applications/$*_src
+       +@echo === User Application: $* && $(SUBMAKE) all -C Usermode/Applications/$*_src
 
 # Compile & Install
 $(AI_DYNMODS): allinstall-%:
-       @echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all install -C Modules/$*
+       +@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all install -C Modules/$*
 $(AI_MODULES): allinstall-%:
-       @echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all install -C Modules/$*
+       +@echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all install -C Modules/$*
 allinstall-Kernel:
-       @echo === Kernel && $(SUBMAKE) all install -C Kernel
+       +@echo === Kernel && $(SUBMAKE) all install -C Kernel
 $(AI_USRLIBS): allinstall-%:
-       @echo === User Library: $* && $(SUBMAKE) all install -C Usermode/Libraries/$*_src
+       +@echo === User Library: $* && $(SUBMAKE) all install -C Usermode/Libraries/$*_src
 $(AI_USRAPPS): allinstall-%:
-       @echo === User Application: $* && $(SUBMAKE) all install -C Usermode/Applications/$*_src
+       +@echo === User Application: $* && $(SUBMAKE) all install -C Usermode/Applications/$*_src
 
 # Clean up compilation
 $(CLEAN_DYNMODS): clean-%:
-       @BUILDTYPE=dynamic $(SUBMAKE) clean -C Modules/$*
+       +@BUILDTYPE=dynamic $(SUBMAKE) clean -C Modules/$*
 $(CLEAN_MODULES): clean-%:
-       @BUILDTYPE=static $(SUBMAKE) clean -C Modules/$*
+       +@BUILDTYPE=static $(SUBMAKE) clean -C Modules/$*
 clean-Kernel:
-       @$(SUBMAKE) clean -C Kernel
+       +@$(SUBMAKE) clean -C Kernel
 $(CLEAN_USRLIBS): clean-%:
-       @$(SUBMAKE) clean -C Usermode/Libraries/$*_src
+       +@$(SUBMAKE) clean -C Usermode/Libraries/$*_src
 $(CLEAN_USRAPPS): clean-%:
-       @$(SUBMAKE) clean -C Usermode/Applications/$*_src
+       +@$(SUBMAKE) clean -C Usermode/Applications/$*_src
 
 # Install
 $(INSTALL_DYNMODS): install-%:

diff --git a/Makefile.cfg b/Makefile.cfg
index 7e35445..4155f5e 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -49,3 +49,5 @@ MODULES += Filesystems/NTFS
 MODULES += IPStack
 DYNMODS := USB/Core
 MODULES += Interfaces/UDI
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA

diff --git a/Usermode/Libraries/libc.so_src/fileIO.c b/Usermode/Libraries/libc.so_src/fileIO.c
index d69a4be..4117b02 100644 (file)
--- a/Usermode/Libraries/libc.so_src/fileIO.c
+++ b/Usermode/Libraries/libc.so_src/fileIO.c
@@ -245,7 +245,7 @@ EXPORT int fputc(int c, FILE *fp)
  */\r
 EXPORT int fgetc(FILE *fp)\r
 {\r
-        int    ret = 0;\r
+       char    ret = 0;\r
        if(!fp) return -1;\r
        if(read(fp->FD, 1, &ret) == -1) return -1;\r
        return ret;\r

diff --git a/Usermode/include/stdint.h b/Usermode/include/stdint.h
index c7ff8fc..a7857ef 100644 (file)
--- a/Usermode/include/stdint.h
+++ b/Usermode/include/stdint.h
@@ -3,7 +3,7 @@
 #ifndef _STDTYPES_H_
 #define _STDTYPES_H_
 
-typedef unsigned int   uint;
+//typedef unsigned int uint;
 typedef unsigned char  uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned long  uint32_t;