[OpenNeo-CVS] openuu main.c,1.2,1.3

[Francois B <mrs...@us...>]

Update of /cvsroot/openneo/openuu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28082

Modified Files:
	main.c 
Log Message:
main cleanup, splash update, etc.  Patch from jkozee and myself

Index: main.c
===================================================================
RCS file: /cvsroot/openneo/openuu/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c	14 Sep 2005 04:17:39 -0000	1.2
--- main.c	27 Sep 2005 02:03:37 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  #include "main_menu.h"
  #include "file.h"
+ #include "lang.h"
  
  char appsversion[]=APPSVERSION;
***************
*** 16,24 ****
  
  void init(void);
- void port_init(void);
  
  void app_main(void)
  {
!     port_init();
      
      button_init();
--- 17,24 ----
  
  void init(void);
  
  void app_main(void)
  {
!     flash_init();
      
      button_init();
***************
*** 29,36 ****
          if (PBDR&0x8000) {
              lcd_init();
!             lcd_puts(0,0,"     Open Neo!      ");
!             lcd_puts(0,1,"                    ");
!             lcd_puts(0,2,"  USB connection    ");
!             lcd_puts(0,3,"     detected.      ");
              DEBUGF("USB connection detected, hanging...\n");
              while (1) {
--- 29,39 ----
          if (PBDR&0x8000) {
              lcd_init();
! 			lcd_puts_center(0, "Open Update Utility!" );
! 			lcd_puts_center(2, str(LANG_HOST_COMPUTER) );
! 			lcd_puts_center(3, str(LANG_DETECTED) );
!             //lcd_puts(0,0,"     Open Neo!      ");
!             //lcd_puts(0,1,"                    ");
!             //lcd_puts(0,2,"  USB connection    ");
!             //lcd_puts(0,3,"     detected.      ");
              DEBUGF("USB connection detected, hanging...\n");
              while (1) {
***************
*** 43,46 ****
--- 46,50 ----
  
          main_menu();
+ 		reboot_menu();
      } else {
          DEBUGF("OpenUU: No Program button found, calling 0x20200...\n");
***************
*** 51,75 ****
  
  /* defined in linker script */
! extern int poolstart[];
! extern int poolend[];
! 
! void port_init(void)
! {
!     PAIOR=0x0B82;
!     PACR1=0x1502;
!     PACR2=0xBF91;
!     PBIOR=0x20FF;
!     PBCR1=0x52A8;
!     PBCR2=0x0;
! 
!     WCR1=0x40FF; //from NUU35.BIN
!     WCR3&=0xE7FF;
! }
  
  void init(void)
  {
      int rc, i;
!    
      lcd_init();
  
      show_logo();
--- 55,69 ----
  
  /* defined in linker script */
! //extern int poolstart[];
! //extern int poolend[];
  
  void init(void)
  {
      int rc, i;
! 	unsigned char cgram_play[] = { 0x10, 0x18, 0x1c, 0x1e, 0x1c, 0x18, 0x10, 0x00 };// Play Icon
! 
! 
      lcd_init();
+ 	lcd_set_cgram(0x05,cgram_play);
  
      show_logo();