summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--userspace/Makefile2
-rw-r--r--userspace/cat.c2
-rw-r--r--userspace/ls.c2
-rw-r--r--userspace/snake.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/userspace/Makefile b/userspace/Makefile
index a1d0945..f5c9e97 100644
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -4,10 +4,10 @@ IMAGESIZE=30000 #ext2.img size in Kb (30Megs)
CC=i686-foolos-gcc
CC=i686-elf-gcc
+AS=i686-elf-as
CFLAGS=
CFLAGS=-w
-CFLAGS=-ffreestanding
CFLAGS+=-I..
CFLAGS+=-I/home/miguel/temp/foolos/usr/i686-foolos/include
CFLAGS+=-O0
diff --git a/userspace/cat.c b/userspace/cat.c
index 688ebcc..800a14b 100644
--- a/userspace/cat.c
+++ b/userspace/cat.c
@@ -7,7 +7,7 @@ int main()
printf("-- read from stderr byte by byte --\n");
- while(has_data_waiting(2)){
+ while(_poll(2)){
fread(&c,1,1,stderr);
printf("%c",c);
}
diff --git a/userspace/ls.c b/userspace/ls.c
index 79e0633..413755b 100644
--- a/userspace/ls.c
+++ b/userspace/ls.c
@@ -26,7 +26,7 @@ int main(int argc, char **argv)
}
}
- int ls=readdir(dir,dirs,25);
+ int ls=_readdir(dir,dirs,25);
if(ls==-1)
{
printf("%s: file or directory '%s' not found.\n",argv[0],dir);
diff --git a/userspace/snake.c b/userspace/snake.c
index 4eb5b5e..9bf9fe2 100644
--- a/userspace/snake.c
+++ b/userspace/snake.c
@@ -19,14 +19,14 @@ int main()
printf("setvbuf returned %i\n",setvbuf(stdin,NULL,_IONBF,0));
- fool_tune(1,0,0); // activate gaming mode
+ //fool_tune(1,0,0); // activate gaming mode
while(1)
{
uint8_t x=0;
- while(!has_data_waiting())
+ while(!_poll(0))
{
x++;
@@ -43,5 +43,5 @@ int main()
}
- fool_tune(0,0,0); // de-activate gaming mode
+ //fool_tune(0,0,0); // de-activate gaming mode
}