Changeset 4bc22a6d in rtems

Timestamp:

07/07/05 22:07:11 (18 years ago)

Author:

Philippe Simons <loki_666@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

a617dac1

Parents:

1f18710

Message:

2005-07-07 Philippe Simons <loki_666@…>

• Makefile.am: Remove lcd.rel, added console/uart.c, removed conio stuffs.
• console/conio.c, console/console.c, console/defaultfont.c, include/conio.h : files removed.
• console/uart.c: New file.
• include/bsp.h: lcd.c prototypes removed.
• startup/bspstart.c: bsp_reset() cause gp32 to reset to bios, added a bsp_idle_task which put s3c2400 in a "wait for IRQ" state.

Location:

c/src/lib/libbsp/arm/gp32

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (4 diffs)
• console/conio.c (deleted)
• console/console.c (deleted)
• console/defaultfont.c (deleted)
• console/uart.c (added)
• include/bsp.h (modified) (1 diff)
• include/conio.h (deleted)
• startup/bspstart.c (modified) (6 diffs)

c/src/lib/libbsp/arm/gp32/ChangeLog

@@ +1 @@
+2005-07-07      Philippe Simons <loki_666@fastmail.fm>
+
+        * Makefile.am: Remove lcd.rel, added console/uart.c,
+        removed conio stuffs.
+        * console/conio.c, console/console.c, console/defaultfont.c,
+        include/conio.h : files removed.
+        * console/uart.c: New file.
+        * include/bsp.h: lcd.c prototypes removed.
+        * startup/bspstart.c: bsp_reset() cause gp32 to reset to bios,
+        added a bsp_idle_task which put s3c2400 in a "wait for IRQ" state.
+
 2005-06-06      Philippe Simons <loki_666@fastmail.fm>
 

c/src/lib/libbsp/arm/gp32/Makefile.am

@@ -11 +11 @@
 
 include_HEADERS = include/bsp.h
-include_HEADERS += include/conio.h
 include_HEADERS += include/tm27.h
 
@@ -37 +36 @@
 
 noinst_PROGRAMS += console.rel
-console_rel_SOURCES = console/conio.c console/defaultfont.c console/console.c
+console_rel_SOURCES = console/uart.c ../../shared/console.c
 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
@@ -47 +46 @@
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/lcd.rel
+    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
@@ -73 +71 @@
         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/conio.h: include/conio.h $(PROJECT_INCLUDE)/$(dirstamp)
-        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/conio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/conio.h
 
 $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)

c/src/lib/libbsp/arm/gp32/include/bsp.h

@@ -33 +33 @@
 extern rtems_configuration_table BSP_Configuration;
 
-void gp32_setFramebuffer(void *add);
-short gp32_initFramebufferN(void *add, uint32_t bitmode, uint32_t refreshrate);
-short gp32_initFramebufferBP(void *add, uint32_t bitmode, uint32_t refreshrate);
 #define gp32_initButtons() {rPBCON=0x0;}
 #define gp32_getButtons() ( (((~rPEDAT >> 6) & 0x3 )<<8) | (((~rPBDAT >> 8) & 0xFF)<<0) )

c/src/lib/libbsp/arm/gp32/startup/bspstart.c

@@ -20 +20 @@
 #include <rtems/bspIo.h>
 #include <s3c2400.h>
-#include <conio.h>
 
 /*-------------------------------------------------------------------------+
@@ -80 +79 @@
 
 } /* bsp_pretasking_hook */
+
+void bsp_idle_task(void)
+{
+        while(1){
+                asm volatile ("MCR p15,0,r0,c7,c0,4     \n");
+        }
+}
  
 /*-------------------------------------------------------------------------+
@@ -99 +105 @@
     Cpu_table.predriver_hook       = NULL;                /* use system's    */
     Cpu_table.postdriver_hook      = bsp_postdriver_hook;
-    Cpu_table.idle_task            = NULL;
+    Cpu_table.idle_task            = bsp_idle_task;
                                           
     Cpu_table.do_zero_of_workspace = TRUE;
@@ -105 +111 @@
     Cpu_table.extra_mpci_receive_server_stack = 0;
 
-    /* setup rCLKCON */
-    /* disable all but IIS,IIC,PWMTIMER and LCD */
-    rCLKCON=0x6048;
-
     /* stop RTC */
     rTICINT=0x0;
@@ -120 +122 @@
     rINTMOD=0x0;
     rINTMSK=BIT_ALLMSK; /* unmasked by drivers */
-    /*rSRCPND=BIT_ALLMSK;
-    rINTMSK=BIT_ALLMSK;
-    rINTPND=BIT_ALLMSK;*/
+
+    last=0;
     for(i=0; i<4; i++) {
         pend=rSRCPND;
@@ -201 +202 @@
     _CPU_ISR_Disable(level);
     printk("bsp_reset.....\n");
-    ShowConIO();
-    while(1);
+        /* disable mmu, invalide i-cache and call swi #4 */
+        asm volatile(""
+                "mrc    p15,0,r0,c1,c0,0        \n"
+                "bic    r0,r0,#1                        \n"
+                "mcr    p15,0,r0,c1,c0,0        \n"
+                "nop                                            \n"
+                "nop                                            \n"
+                "nop                                            \n"
+                "nop                                            \n"
+                "nop                                            \n"
+                "mov    r0,#0                                   \n"
+                "MCR    p15,0,r0,c7,c5,0                        \n"
+                "nop                                            \n"
+                "nop                                            \n"
+                "nop                                            \n"
+                "nop                                            \n"
+                "nop                                            \n"
+                "swi    #4                                      "
+        :
+        :
+        : "r0"
+        );
+        /* we should be back in bios now */
 }