[BSP] remove display_controller.h/c from ls1cdev bsp

bsp/ls1cdev/applications/application.c

@@ -9,44 +9,18 @@
  *
  * Change Logs:
  * Date                Author         Notes
- * 2010-06-25     Bernard        first version
- * 2011-08-08     lgnq             modified for Loongson LS1B
- * 2015-07-06     chinesebear   modified for Loongson LS1C
+ * 2010-06-25          Bernard        first version
+ * 2011-08-08          lgnq           modified for Loongson LS1B
+ * 2015-07-06          chinesebear    modified for Loongson LS1C
  */
 
 #include <rtthread.h>
-#include <ls1c.h>
-
-#ifdef RT_USING_COMPONENTS_INIT
 #include <components.h>
-#endif
-
-#ifdef RT_USING_RTGUI
-#include <rtgui/rtgui.h>
-extern void rt_hw_dc_init(void);
-#endif
 
 void rt_init_thread_entry(void *parameter)
 {
-#ifdef RT_USING_RTGUI
-	{
-		rt_device_t dc;
-
-		/* init Display Controller */
-		rt_hw_dc_init();
-
-		/* find Display Controller device */
-		dc = rt_device_find("dc");
-
-		/* set Display Controller device as rtgui graphic driver */
-		rtgui_graphic_set_device(dc);
-	}
-#endif
-
-#ifdef RT_USING_COMPONENTS_INIT
 	/* initialization RT-Thread Components */
 	rt_components_init();
-#endif
 }
 
 int rt_application_init(void)
@@ -56,11 +30,9 @@ int rt_application_init(void)
 	/* create initialization thread */
 	tid = rt_thread_create("init",
 							rt_init_thread_entry, RT_NULL,
-							4096, 8, 20);
+							4096, RT_THREAD_PRIORITY_MAX/3, 20);
 	if (tid != RT_NULL)
 		rt_thread_startup(tid);
 
 	return 0;
 }
-
-

bsp/ls1cdev/applications/startup.c

@@ -77,12 +77,6 @@ void rtthread_startup(void)
     /* init application */
     rt_application_init();
 
-   /* init finsh*/
-   #ifdef RT_USING_FINSH
-   finsh_system_init();
-   finsh_set_device("uart2");
-   #endif
-
     /* start scheduler */
     rt_system_scheduler_start();
 

bsp/ls1cdev/drivers/SConscript

@@ -3,10 +3,6 @@ from building import *
 cwd = GetCurrentDir()
 src = Glob('*.c')
 
-# remove no need file.
-if GetDepend('RT_USING_RTGUI') == False:
-    SrcRemove(src, 'display_controller.c')
-
 CPPPATH = [cwd]
 
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)

bsp/ls1cdev/drivers/board.c

@@ -110,5 +110,3 @@ void rt_hw_console_output(const char *ptr)
 }
 
 /*@}*/
-
-

bsp/ls1cdev/drivers/display_controller.c

@@ -1,234 +0,0 @@
-/*
- * File      : display_controller.c
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006-2012, RT-Thread Develop Team
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date           Author       Notes
- * 2011-08-09     lgnq         first version for LS1B DC
- */
-
-#include <rtthread.h>
-#include "display_controller.h"
-
-struct vga_struct vga_mode[] =
-{
-	{/*"640x480_70.00"*/    28560,  640,    664,    728,    816,    480,    481,    484,    500,    },
-	{/*"640x640_60.00"*/	33100,	640,	672,	736,	832,	640,	641,	644,	663,	},
-	{/*"640x768_60.00"*/	39690,	640,	672,	736,	832,	768,	769,	772,	795,	},
-	{/*"640x800_60.00"*/	42130,	640,	680,	744,	848,	800,	801,	804,	828,	},
-	{/*"800x480_70.00"*/    35840,  800,    832,    912,    1024,   480,    481,    484,    500,    },
-	{/*"800x600_60.00"*/	38220,	800,	832,	912,	1024,	600,	601,	604,	622,	},
-	{/*"800x640_60.00"*/	40730,	800,	832,	912,	1024,	640,	641,	644,	663,	},
-	{/*"832x600_60.00"*/	40010,	832,	864,	952,	1072,	600,	601,	604,	622,	},
-	{/*"832x608_60.00"*/	40520,	832,	864,	952,	1072,	608,	609,	612,	630,	},
-	{/*"1024x480_60.00"*/	38170,	1024,	1048,	1152,	1280,	480,	481,	484,	497,	},
-	{/*"1024x600_60.00"*/	48960,	1024,	1064,	1168,	1312,	600,	601,	604,	622,	},
-	{/*"1024x640_60.00"*/	52830,	1024,	1072,	1176,	1328,	640,	641,	644,	663,	},
-	{/*"1024x768_60.00"*/	64110,	1024,	1080,	1184,	1344,	768,	769,	772,	795,	},
-	{/*"1152x764_60.00"*/   71380,  1152,   1208,   1328,   1504,   764,    765,    768,    791,    },
-	{/*"1280x800_60.00"*/   83460,  1280,   1344,   1480,   1680,   800,    801,    804,    828,    },
-	{/*"1280x1024_55.00"*/  98600,  1280,   1352,   1488,   1696,   1024,   1025,   1028,   1057,   },
-	{/*"1440x800_60.00"*/   93800,  1440,   1512,   1664,   1888,   800,    801,    804,    828,    },
-	{/*"1440x900_67.00"*/   120280, 1440,   1528,   1680,   1920,   900,    901,    904,    935,    },
-};
-
-ALIGN(16)
-volatile rt_uint16_t _rt_framebuffer[FB_YSIZE][FB_XSIZE];
-static struct rt_device_graphic_info _dc_info;
-
-#define abs(x) ((x<0)?(-x):x)
-#define min(a,b) ((a<b)?a:b)
-
-int caclulate_freq(long long XIN, long long PCLK)
-{
-	int i;
-	long long clk, clk1;
-	int start, end;
-	int mi;
-	int pll,ctrl,div,div1,frac;
-
-	pll = PLL_FREQ;
-	ctrl = PLL_DIV_PARAM;
-	rt_kprintf("pll=0x%x, ctrl=0x%x\n", pll, ctrl);
-//	rt_kprintf("cpu freq is %d\n", tgt_pipefreq());
-	start = -1;
-	end = 1;
-
-	for (i=start; i<=end; i++)
-	{
-		clk = (12+i+(pll&0x3f))*33333333/2;
-		div = clk/(long)PCLK/1000;
-		clk1 = (12+i+1+(pll&0x3f))*33333333/2;
-		div1 = clk1/(long)PCLK/1000;
-		if (div!=div1)
-			break;
-	}
-
-	if (div!=div1)
-	{
-		frac = ((PCLK*1000*div1)*2*1024/33333333 - (12+i+(pll&0x3f))*1024)&0x3ff;
-		pll = (pll & ~0x3ff3f)|(frac<<8)|((pll&0x3f)+i);
-		ctrl = ctrl&~(0x1f<<26)|(div1<<26)|(1<<31);
-	}
-	else
-	{
-		clk = (12+start+(pll&0x3f))*33333333/2;
-		clk1 = (12+end+(pll&0x3f))*33333333/2;
-		if (abs((long)clk/div/1000-PCLK)<abs((long)clk1/(div+1)/1000-PCLK))
-		{
-			pll = (pll & ~0x3ff3f)|((pll&0x3f)+start);
-			ctrl = ctrl&~(0x1f<<26)|(div<<26)|(1<<31);
-		}
-		else
-		{
-			pll = (pll & ~0x3ff3f)|((pll&0x3f)+end);
-			ctrl = ctrl&~(0x1f<<26)|((div+1)<<26)|(1<<31);
-		}
-	}
-
-	rt_kprintf("new pll=0x%x, ctrl=0x%x\n", pll, ctrl);
-	ctrl |= 0x2a00;
-	PLL_DIV_PARAM = ctrl; 
-	PLL_FREQ = pll;
-	rt_thread_delay(10);
-//	initserial(0);
-//	_probe_frequencies();
-//	rt_kprintf("cpu freq is %d\n",tgt_pipefreq());
-	return 0;
-}
-
-static rt_err_t rt_dc_init(rt_device_t dev)
-{
-	int i, out, mode=-1;
-	int val;
-
-	for (i=0; i<sizeof(vga_mode)/sizeof(struct vga_struct); i++)
-	{
-		if (vga_mode[i].hr == FB_XSIZE && vga_mode[i].vr == FB_YSIZE)
-		{
-			mode=i;
-#ifdef LS1FSOC
-//			out = caclulatefreq(APB_CLK/1000,vga_mode[i].pclk);
-//			rt_kprintf("out=%x\n",out);
-			/*inner gpu dc logic fifo pll ctrl,must large then outclk*/
-//			*(volatile int *)0xbfd00414 = out+1;
-			/*output pix1 clock  pll ctrl*/
-//			*(volatile int *)0xbfd00410 = out;
-			/*output pix2 clock pll ctrl */
-//			*(volatile int *)0xbfd00424 = out;
-#else
-			caclulate_freq(APB_CLK/1000, vga_mode[i].pclk);
-#endif
-			break;
-		}
-	}
-
-	if (mode<0)
-	{
-		rt_kprintf("\n\n\nunsupported framebuffer resolution\n\n\n");
-		return;
-	}
-
-	DC_FB_CONFIG = 0x0;
-	DC_FB_CONFIG = 0x3; //	// framebuffer configuration RGB565
- 	DC_FB_BUFFER_ADDR0 = (rt_uint32_t)_rt_framebuffer - 0x80000000;
-	DC_FB_BUFFER_ADDR1 = (rt_uint32_t)_rt_framebuffer - 0x80000000;
-	DC_DITHER_CONFIG = 0x0;
-	DC_DITHER_TABLE_LOW = 0x0;
-	DC_DITHER_TABLE_HIGH = 0x0;
-	DC_PANEL_CONFIG = 0x80001311;
-	DC_PANEL_TIMING = 0x0;
-
-	DC_HDISPLAY = (vga_mode[mode].hfl<<16) | vga_mode[mode].hr;
-	DC_HSYNC = 0x40000000 | (vga_mode[mode].hse<<16) | vga_mode[mode].hss;
-	DC_VDISPLAY = (vga_mode[mode].vfl<<16) | vga_mode[mode].vr;
-	DC_VSYNC = 0x40000000 | (vga_mode[mode].vse<<16) | vga_mode[mode].vss;
-
-#if defined(CONFIG_VIDEO_32BPP)
-	DC_FB_CONFIG = 0x00100104;
-	DC_FB_BUFFER_STRIDE = FB_XSIZE*4;
-#elif defined(CONFIG_VIDEO_16BPP)
-	DC_FB_CONFIG = 0x00100103;
-	DC_FB_BUFFER_STRIDE = (FB_XSIZE*2+255)&(~255);
-#elif defined(CONFIG_VIDEO_15BPP)
-	DC_FB_CONFIG = 0x00100102;
-	DC_FB_BUFFER_STRIDE = FB_XSIZE*2;
-#elif defined(CONFIG_VIDEO_12BPP)
-	DC_FB_CONFIG = 0x00100101;
-	DC_FB_BUFFER_STRIDE = FB_XSIZE*2;
-#else  //640x480-32Bits
-	DC_FB_CONFIG = 0x00100104;
-	DC_FB_BUFFER_STRIDE = FB_XSIZE*4;
-#endif //32Bits
-
-#ifdef LS1GSOC
-	/*fix ls1g dc
-	 *first switch to tile mode
-	 *change origin register to 0
-	 *goback nomal mode
-	 */
-	{
-		val = DC_FB_CONFIG;
-		DC_FB_CONFIG = val | 0x10;
-		DC_FB_BUFFER_ORIGIN = 0;
-		DC_FB_BUFFER_ORIGIN;
-		rt_thread_delay(10);
-		DC_FB_CONFIG;
-		DC_FB_CONFIG = val;
-	}
-#endif
-
-	return RT_EOK;
-}
-
-static rt_err_t rt_dc_control(rt_device_t dev, rt_uint8_t cmd, void *args)
-{
-	switch (cmd)
-	{
-	case RTGRAPHIC_CTRL_RECT_UPDATE:
-		break;
-	case RTGRAPHIC_CTRL_POWERON:
-		break;
-	case RTGRAPHIC_CTRL_POWEROFF:
-		break;
-	case RTGRAPHIC_CTRL_GET_INFO:		
-		rt_memcpy(args, &_dc_info, sizeof(_dc_info));
-		break;
-	case RTGRAPHIC_CTRL_SET_MODE:
-		break;
-	}
-
-	return RT_EOK;
-}
-
-void rt_hw_dc_init(void)
-{
-	rt_device_t dc = rt_malloc(sizeof(struct rt_device));
-	if (dc == RT_NULL) 
-	{
-		rt_kprintf("dc == RT_NULL\n");
-		return; /* no memory yet */
-	}
-
-	_dc_info.bits_per_pixel = 16;
-	_dc_info.pixel_format = RTGRAPHIC_PIXEL_FORMAT_RGB565P;
-	_dc_info.framebuffer = (rt_uint8_t*)HW_FB_ADDR;
-	_dc_info.width = FB_XSIZE;
-	_dc_info.height = FB_YSIZE;
-
-	/* init device structure */
-	dc->type = RT_Device_Class_Graphic;
-	dc->init = rt_dc_init;
-	dc->open = RT_NULL;
-	dc->close = RT_NULL;
-	dc->control = rt_dc_control;
-	dc->user_data = (void*)&_dc_info;
-	
-	/* register Display Controller device to RT-Thread */
-	rt_device_register(dc, "dc", RT_DEVICE_FLAG_RDWR);
-}

bsp/ls1cdev/drivers/display_controller.h

@@ -1,59 +0,0 @@
-/*
- * File      : display_controller.h
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006-2012, RT-Thread Develop Team
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date                Author           Notes
- * 2011-08-08     lgnq            first version for LS1B
- * 2015-07-06    chinesebear   modified for loongson 1c
- */
- 
-#ifndef __DISPLAY_CONTROLLER_H__
-#define __DISPLAY_CONTROLLER_H__
-
-#include <rtthread.h>
-#include "ls1c.h"
-
-#define DC_BASE					0xBC301240  //Display Controller
-
-/* Frame Buffer registers */
-#define DC_FB_CONFIG			__REG32(DC_BASE + 0x000)
-#define DC_FB_BUFFER_ADDR0		__REG32(DC_BASE + 0x020)
-#define DC_FB_BUFFER_STRIDE		__REG32(DC_BASE + 0x040)
-#define DC_FB_BUFFER_ORIGIN		__REG32(DC_BASE + 0x060)
-#define DC_DITHER_CONFIG		__REG32(DC_BASE + 0x120)
-#define DC_DITHER_TABLE_LOW		__REG32(DC_BASE + 0x140)
-#define DC_DITHER_TABLE_HIGH	__REG32(DC_BASE + 0x160)
-#define DC_PANEL_CONFIG			__REG32(DC_BASE + 0x180)
-#define DC_PANEL_TIMING			__REG32(DC_BASE + 0x1A0)
-#define DC_HDISPLAY				__REG32(DC_BASE + 0x1C0)
-#define DC_HSYNC				__REG32(DC_BASE + 0x1E0)
-#define DC_VDISPLAY				__REG32(DC_BASE + 0x240)
-#define DC_VSYNC				__REG32(DC_BASE + 0x260)
-#define DC_FB_BUFFER_ADDR1		__REG32(DC_BASE + 0x340)
-
-/* Display Controller driver for 1024x768 16bit */
-#define FB_XSIZE		1024
-#define FB_YSIZE		768
-#define CONFIG_VIDEO_16BPP
-
-#define APB_CLK 33333333
-
-#define K1BASE				0xA0000000
-#define KSEG1(addr)			((void *)(K1BASE | (rt_uint32_t)(addr)))
-#define HW_FB_ADDR			KSEG1(_rt_framebuffer)
-#define HW_FB_PIXEL(x, y)	*(volatile rt_uint16_t*)((rt_uint8_t*)HW_FB_ADDR + (y * FB_XSIZE * 2) + x * 2)
-
-struct vga_struct
-{
-	long pclk;
-	int hr,hss,hse,hfl;
-	int vr,vss,vse,vfl;
-};
-
-#endif

bsp/ls1cdev/rtconfig.h

@@ -23,6 +23,8 @@
 #define RT_USING_OVERFLOW_CHECK
 // <bool name="RT_USING_INTERRUPT_INFO" description="Show more interrupt description" default="true" />
 #define RT_USING_INTERRUPT_INFO
+// <integer name="IDLE_THREAD_STACK_SIZE" description="The stack size of idle thread" default="1024" />
+#define IDLE_THREAD_STACK_SIZE	1024
 // </section>
 
 // <bool name="RT_USING_HOOK" description="Using hook functions" default="true" />
@@ -91,15 +93,16 @@
 #define FINSH_USING_DESCRIPTION
 // <integer name="FINSH_THREAD_STACK_SIZE" description="The stack size for finsh thread" default="4096" />
 #define FINSH_THREAD_STACK_SIZE	4096
+// <bool name="FINSH_USING_MSH" description="Using module shell" default="true" />
+#define FINSH_USING_MSH
+// <bool name="FINSH_USING_MSH_DEFAULT" description="Using module shell as the default shell" default="true" />
+#define FINSH_USING_MSH_DEFAULT
 // </section>
 
-
 // <section name="LIBC" description="C Runtime library setting" default="always" >
 #define RT_USING_LIBC
-// <bool name="RT_USING_NEWLIB" description="Using newlib library, only available under GNU GCC" default="true" />
-// #define RT_USING_NEWLIB
 // <bool name="RT_USING_PTHREADS" description="Using POSIX threads library" default="true" />
-// #define RT_USING_PTHREADS
+#define RT_USING_PTHREADS
 // </section>
 
 // <section name="RT_USING_DFS" description="Device file system" default="true" >