mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-11-05 19:07:41 +00:00
fb5d0b7ef0
So far 80 column display was an attribute of a cc65 platform. Now each cc65 application can ask for 80 column display by defining WITH_80COL. Of course this is ignored by platforms incapable of 80 column display. I see three types of application: * Applications not benefitting from 80 column at all and in fact looking better with 40 column display. These are now using 40 column display. Examples: ethconfig, ipconfig * Applications taking advantage of 80 column display if it is available without drawbacks. These stay as they were. Examples: Telnet server, web server, wget * Applications needing 80 column display so urgently that it is likely desirable even if the display becomes harder to read. These come now in both flavors allowing the user to choose. Examples: IRC, web browser Note: This change doesn't actually introduce any 80 column display with drawbacks. This if left to a subsequent change.
133 lines
3.5 KiB
C
133 lines
3.5 KiB
C
/*
|
|
* Copyright (c) 2006, Swedish Institute of Computer Science.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the Institute nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* This file is part of the Contiki operating system.
|
|
*
|
|
* Author: Oliver Schmidt <ol.sc@web.de>
|
|
*
|
|
*/
|
|
|
|
#include "contiki-net.h"
|
|
#include "ctk/ctk.h"
|
|
#include "sys/log.h"
|
|
#include "lib/config.h"
|
|
#include "net/ethernet-drv.h"
|
|
|
|
#if WITH_GUI
|
|
#define CTK_PROCESS &ctk_process,
|
|
#else /* WITH_GUI */
|
|
#define CTK_PROCESS
|
|
#endif /* WITH_GUI */
|
|
|
|
#if WITH_DNS
|
|
#define RESOLV_PROCESS ,&resolv_process
|
|
#else /* WITH_DNS */
|
|
#define RESOLV_PROCESS
|
|
#endif /* WITH_DNS */
|
|
|
|
PROCINIT(&etimer_process,
|
|
CTK_PROCESS
|
|
&tcpip_process
|
|
RESOLV_PROCESS);
|
|
|
|
static struct ethernet_config *ethernet_config;
|
|
|
|
void clock_update(void);
|
|
|
|
/*-----------------------------------------------------------------------------------*/
|
|
#if WITH_ARGS
|
|
|
|
int contiki_argc;
|
|
char **contiki_argv;
|
|
|
|
void
|
|
main(int argc, char **argv)
|
|
{
|
|
contiki_argc = argc;
|
|
contiki_argv = argv;
|
|
|
|
#else /* WITH_ARGS */
|
|
|
|
void
|
|
main(void)
|
|
{
|
|
|
|
#endif /* WITH_ARGS */
|
|
|
|
#if WITH_REBOOT
|
|
rebootafterexit();
|
|
#endif /* WITH_REBOOT */
|
|
|
|
#if WITH_80COL
|
|
videomode(VIDEOMODE_80COL);
|
|
#endif /* WITH_80COL */
|
|
|
|
process_init();
|
|
|
|
#if 1
|
|
ethernet_config = config_read("contiki.cfg");
|
|
#else
|
|
{
|
|
static struct ethernet_config config = {0xC0B0, "cs8900a.eth"};
|
|
uip_ipaddr_t addr;
|
|
|
|
uip_ipaddr(&addr, 192,168,0,128);
|
|
uip_sethostaddr(&addr);
|
|
|
|
uip_ipaddr(&addr, 255,255,255,0);
|
|
uip_setnetmask(&addr);
|
|
|
|
uip_ipaddr(&addr, 192,168,0,1);
|
|
uip_setdraddr(&addr);
|
|
|
|
uip_ipaddr(&addr, 192,168,0,1);
|
|
uip_nameserver_update(&addr, UIP_NAMESERVER_INFINITE_LIFETIME);
|
|
|
|
ethernet_config = &config;
|
|
}
|
|
#endif
|
|
|
|
procinit_init();
|
|
|
|
process_start((struct process *)ðernet_process, (void *)ethernet_config);
|
|
|
|
autostart_start(autostart_processes);
|
|
|
|
log_message("Contiki up and running ...", "");
|
|
|
|
while(1) {
|
|
|
|
process_run();
|
|
|
|
etimer_request_poll();
|
|
|
|
clock_update();
|
|
}
|
|
}
|
|
/*-----------------------------------------------------------------------------------*/
|