[Contiki-commits] contiki-c64/uip rrnet-dsc.c,1.1,1.2 tfe-dsc.c,1.1,1.2

[Oliver S. <oli...@us...>]

Update of /cvsroot/contiki/contiki-c64/uip
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19010

Modified Files:
	rrnet-dsc.c tfe-dsc.c 
Log Message:
Part 12 of adding two new ctk configuration macros:
- CTK_CONF_ICON_BITMAPS
- CTK_CONF_ICON_TEXTMAPS

These macros control if icon bitmaps resp. textmaps are used at all. For all platfroms only needing one or the other this saves memory as the application description files don't define the unused stuff anymore. Especially for the conio based platforms this is a significant benefit.

Note: For all platforms (apart for Apple2 and Atari) I initially defined both macros as 1 which should lead to an unchanged bevaviour. I leave it up to the platform maintainers to make use of the new macros by optionally setting one to 0.

Index: tfe-dsc.c
===================================================================
RCS file: /cvsroot/contiki/contiki-c64/uip/tfe-dsc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tfe-dsc.c	25 Apr 2003 08:46:07 -0000	1.1
--- tfe-dsc.c	27 Jun 2004 12:44:51 -0000	1.2
***************
*** 44,47 ****
--- 44,48 ----
      &tfe_icon);
  /*-----------------------------------------------------------------------------------*/
+ #if CTK_CONF_ICON_BITMAPS
  static unsigned char tfeicon_bitmap[3*3*8] = {
    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
***************
*** 57,61 ****
--- 58,64 ----
    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
  };
+ #endif /* CTK_CONF_ICON_BITMAPS */
  
+ #if CTK_CONF_ICON_TEXTMAPS
  static char tfeicon_textmap[9] = {
    'T', 'C', 'P',
***************
*** 63,66 ****
--- 66,70 ----
    'T', 'F', 'E'
  };
+ #endif /* CTK_CONF_ICON_TEXTMAPS */
  
  static struct ctk_icon tfe_icon =

Index: rrnet-dsc.c
===================================================================
RCS file: /cvsroot/contiki/contiki-c64/uip/rrnet-dsc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rrnet-dsc.c	30 Jul 2003 22:40:36 -0000	1.1
--- rrnet-dsc.c	27 Jun 2004 12:44:51 -0000	1.2
***************
*** 44,47 ****
--- 44,48 ----
      &rrnet_icon);
  /*-----------------------------------------------------------------------------------*/
+ #if CTK_CONF_ICON_BITMAPS
  static unsigned char rrneticon_bitmap[3*3*8] = {
    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
***************
*** 57,61 ****
--- 58,64 ----
    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
  };
+ #endif /* CTK_CONF_ICON_BITMAPS */
  
+ #if CTK_CONF_ICON_TEXTMAPS
  static char rrneticon_textmap[9] = {
    'R', 'R', '-',
***************
*** 63,66 ****
--- 66,70 ----
    'D', 'R', 'V'
  };
+ #endif /* CTK_CONF_ICON_TEXTMAPS */
  
  static struct ctk_icon rrnet_icon =