Removed LCD-based UI from demo firmware
authorlekernel <sebastien.bourdeauducq@lekernel.net>
Tue, 22 Jun 2010 14:43:06 +0000 (16:43 +0200)
committerlekernel <sebastien.bourdeauducq@lekernel.net>
Tue, 22 Jun 2010 14:43:06 +0000 (16:43 +0200)
software/demo/Makefile
software/demo/isr.c
software/demo/main.c
software/demo/shell.c
software/demo/tick.c
software/libhal/Makefile

index 4258c16..1469952 100644 (file)
@@ -1,7 +1,7 @@
 MMDIR=../..
 include $(MMDIR)/software/include.mak
 
-OBJECTS=crt0.o isr.o tick.o wave.o analyzer.o eval.o line.o apipe.o rpipe.o renderer.o cpustats.o memstats.o shell.o ui.o main.o
+OBJECTS=crt0.o isr.o tick.o wave.o analyzer.o eval.o line.o apipe.o rpipe.o renderer.o cpustats.o memstats.o shell.o main.o
 SEGMENTS=-j .text -j .data -j .rodata
 
 all: boot.bin
@@ -61,11 +61,11 @@ eval.o: ../../software/include/fpvm/is.h ../../software/include/fpvm/gfpus.h
 eval.o: ../../software/include/fpvm/pfpu.h eval.h renderer.h
 isr.o: ../../software/include/hw/interrupts.h
 isr.o: ../../software/include/base/irq.h ../../software/include/base/uart.h
-isr.o: ../../software/include/hal/time.h ../../software/include/hal/slowout.h
-isr.o: ../../software/include/hal/snd.h ../../software/include/hw/ac97.h
-isr.o: ../../software/include/hw/common.h ../../software/include/hal/pfpu.h
-isr.o: ../../software/include/hw/pfpu.h ../../software/include/hal/tmu.h
-isr.o: ../../software/include/hw/tmu.h ui.h cpustats.h
+isr.o: ../../software/include/hal/time.h ../../software/include/hal/snd.h
+isr.o: ../../software/include/hw/ac97.h ../../software/include/hw/common.h
+isr.o: ../../software/include/hal/pfpu.h ../../software/include/hw/pfpu.h
+isr.o: ../../software/include/hal/tmu.h ../../software/include/hw/tmu.h
+isr.o: cpustats.h
 line.o: ../../software/include/base/stdlib.h
 line.o: ../../software/include/base/math.h color.h line.h
 main.o: ../../software/include/base/stdio.h
@@ -80,9 +80,8 @@ main.o: ../../software/include/hal/time.h ../../software/include/hal/vga.h
 main.o: ../../software/include/hal/snd.h ../../software/include/hw/ac97.h
 main.o: ../../software/include/hw/common.h ../../software/include/hal/pfpu.h
 main.o: ../../software/include/hw/pfpu.h ../../software/include/hal/tmu.h
-main.o: ../../software/include/hw/tmu.h ../../software/include/hal/slowout.h
-main.o: ../../software/include/hal/hdlcd.h apipe.h rpipe.h renderer.h ui.h
-main.o: cpustats.h memstats.h shell.h
+main.o: ../../software/include/hw/tmu.h apipe.h rpipe.h renderer.h cpustats.h
+main.o: memstats.h shell.h
 memstats.o: ../../software/include/base/board.h
 memstats.o: ../../software/include/hal/brd.h
 memstats.o: ../../software/include/hw/fmlmeter.h
@@ -122,21 +121,10 @@ shell.o: ../../software/include/hw/minimac.h ../../software/include/hal/vga.h
 shell.o: ../../software/include/hal/snd.h ../../software/include/hw/ac97.h
 shell.o: ../../software/include/hal/tmu.h ../../software/include/hal/time.h
 shell.o: ../../software/include/hal/brd.h line.h wave.h rpipe.h cpustats.h
-shell.o: memstats.h shell.h ui.h renderer.h
+shell.o: memstats.h shell.h renderer.h
 tick.o: ../../software/include/hal/time.h rpipe.h
 tick.o: ../../software/include/hal/tmu.h ../../software/include/hw/tmu.h
-tick.o: ../../software/include/hw/common.h cpustats.h memstats.h ui.h
-ui.o: ../../software/include/base/stdio.h
-ui.o: ../../software/include/base/stdlib.h
-ui.o: ../../software/include/base/string.h
-ui.o: ../../software/include/base/cffat.h ../../software/include/base/irq.h
-ui.o: ../../software/include/base/version.h
-ui.o: ../../software/include/hw/interrupts.h
-ui.o: ../../software/include/hw/sysctl.h ../../software/include/hw/common.h
-ui.o: ../../software/include/hw/gpio.h ../../software/include/hal/hdlcd.h
-ui.o: ../../software/include/hal/time.h renderer.h rpipe.h
-ui.o: ../../software/include/hal/tmu.h ../../software/include/hw/tmu.h
-ui.o: cpustats.h ui.h
+tick.o: ../../software/include/hw/common.h cpustats.h memstats.h
 wave.o: ../../software/include/base/stdio.h
 wave.o: ../../software/include/base/stdlib.h
 wave.o: ../../software/include/base/math.h line.h color.h wave.h renderer.h
index 2460aca..8f7801c 100644 (file)
 #include <uart.h>
 
 #include <hal/time.h>
-#include <hal/slowout.h>
 #include <hal/snd.h>
 #include <hal/pfpu.h>
 #include <hal/tmu.h>
 
-#include "ui.h"
 #include "cpustats.h"
 
 void isr()
@@ -43,8 +41,6 @@ void isr()
 
        if(irqs & IRQ_TIMER0)
                time_isr();
-       if(irqs & IRQ_TIMER1)
-               slowout_isr();
 
        if(irqs & IRQ_AC97CRREQUEST)
                snd_isr_crrequest();
@@ -61,10 +57,5 @@ void isr()
        if(irqs & IRQ_TMU)
                tmu_isr();
 
-       if(irqs & IRQ_GPIO) {
-               irq_ack(IRQ_GPIO);
-               ui_isr_key();
-       }
-
        cpustats_leave();
 }
index 19b65cd..21abd86 100644 (file)
 #include <hal/snd.h>
 #include <hal/pfpu.h>
 #include <hal/tmu.h>
-#include <hal/slowout.h>
-#include <hal/hdlcd.h>
 
 #include "apipe.h"
 #include "rpipe.h"
 #include "renderer.h"
-#include "ui.h"
 #include "cpustats.h"
 #include "memstats.h"
 #include "shell.h"
@@ -68,9 +65,6 @@ int main()
        renderer_init();
        apipe_init();
        rpipe_init();
-       slowout_init();
-       hdlcd_init();
-       ui_init();
        shell_init();
        
        while(1) {
@@ -78,7 +72,6 @@ int main()
                        shell_input(readchar());
                apipe_service();
                rpipe_service();
-               ui_service();
        }
        
        return 0;
index 62961ba..1f0615d 100644 (file)
@@ -44,7 +44,6 @@
 #include "cpustats.h"
 #include "memstats.h"
 #include "shell.h"
-#include "ui.h"
 #include "renderer.h"
 
 #define NUMBER_OF_BYTES_ON_A_LINE 16
@@ -167,7 +166,7 @@ static void render(const char *filename)
                return;
        }
 
-       ui_render_from_file(filename, 0);
+       /* TODO */
 }
 
 static void spam()
@@ -419,7 +418,6 @@ static unsigned short original[640*480*2] __attribute__((aligned(2)));
 static void tmudemo()
 {
        int size;
-       unsigned int oldmask;
        static struct tmu_vertex srcmesh[TMU_MESH_MAXSIZE][TMU_MESH_MAXSIZE] __attribute__((aligned(8)));
        struct tmu_td td;
        volatile int complete;
@@ -432,10 +430,6 @@ static void tmudemo()
 
        printf("done\n");
        
-       /* Disable UI keys and slowout */
-       oldmask = irq_getmask();
-       irq_setmask(oldmask & (~IRQ_GPIO) & (~IRQ_TIMER1));
-       
        speed = 0;
        w = 512 << TMU_FIXEDPOINT_SHIFT;
 
@@ -528,8 +522,6 @@ static void tmudemo()
                }
                vga_swap_buffers();
        }
-       irq_ack(IRQ_GPIO|IRQ_TIMER1);
-       irq_setmask(oldmask);
 }
 
 static void tmubench()
@@ -686,7 +678,7 @@ static void do_command(char *c)
                else if(strcmp(command, "irender") == 0) {
                        renderer_istart();
                        irender = 1;
-               } else if(strcmp(command, "stop") == 0) ui_render_stop();
+               } else if(strcmp(command, "stop") == 0) renderer_stop();
                else if(strcmp(command, "spam") == 0) spam();
                else if(strcmp(command, "stats") == 0) stats();
                else if(strcmp(command, "reboot") == 0) reboot();
index 592a9ed..07a7469 100644 (file)
 #include "rpipe.h"
 #include "cpustats.h"
 #include "memstats.h"
-#include "ui.h"
 
 void time_tick()
 {
        rpipe_tick();
        cpustats_tick();
        memstats_tick();
-       ui_tick();
 }
 
index 6e4d34c..8ef85ee 100644 (file)
@@ -1,7 +1,7 @@
 MMDIR=../..
 include $(MMDIR)/software/include.mak
 
-OBJECTS=brd.o hdlcd.o mem.o pfpu.o slowout.o snd.o time.o tmu.o vga.o
+OBJECTS=brd.o mem.o pfpu.o snd.o time.o tmu.o vga.o
 
 all: libhal.a
 
@@ -22,15 +22,6 @@ clean:
 brd.o: ../../software/include/base/stdlib.h
 brd.o: ../../software/include/base/stdio.h
 brd.o: ../../software/include/base/board.h ../../software/include/hal/brd.h
-hdlcd.o: ../../software/include/base/stdlib.h
-hdlcd.o: ../../software/include/base/stdio.h
-hdlcd.o: ../../software/include/base/stdarg.h
-hdlcd.o: ../../software/include/base/board.h
-hdlcd.o: ../../software/include/hw/sysctl.h
-hdlcd.o: ../../software/include/hw/common.h ../../software/include/hw/gpio.h
-hdlcd.o: ../../software/include/hal/brd.h
-hdlcd.o: ../../software/include/hal/slowout.h
-hdlcd.o: ../../software/include/hal/hdlcd.h
 mem.o: ../../software/include/base/stdio.h
 mem.o: ../../software/include/base/stdlib.h
 mem.o: ../../software/include/base/malloc.h ../../software/include/hal/mem.h
@@ -40,13 +31,6 @@ pfpu.o: ../../software/include/base/irq.h
 pfpu.o: ../../software/include/hw/interrupts.h
 pfpu.o: ../../software/include/hw/pfpu.h ../../software/include/hw/common.h
 pfpu.o: ../../software/include/hal/pfpu.h
-slowout.o: ../../software/include/base/stdio.h
-slowout.o: ../../software/include/base/stdlib.h
-slowout.o: ../../software/include/base/irq.h
-slowout.o: ../../software/include/hw/interrupts.h
-slowout.o: ../../software/include/hw/sysctl.h
-slowout.o: ../../software/include/hw/common.h
-slowout.o: ../../software/include/hal/slowout.h
 snd.o: ../../software/include/base/stdio.h
 snd.o: ../../software/include/base/stdlib.h ../../software/include/base/irq.h
 snd.o: ../../software/include/hw/ac97.h ../../software/include/hw/common.h