stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- some code cleanup

Browse source 
git-svn-id: http://svn.lfbs.rwth-aachen.de/svn/scc/trunk/MetalSVM@301 315a16e6-25f9-4109-90ae-ca3045a26c18
This commit is contained in:
stefan 2010-11-30 19:47:46 +00:00
parent 71be663e2d
commit c3c7468208
5 changed files with 148 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/rtl8139.c
View file

@ -267,18 +267,19 @@ static void rtl8139if_handler(struct state* s)
}
}
/*
* Can be called in a polling manner, or only after the RTL8139 has raised
* an interrupt request.
*/
err_t rtl8139if_poll(struct netif* netif)
err_t rtl8139if_wait(struct netif* netif, uint32_t poll)
{
rtl1839if_t* rtl8139if = netif->state;
struct eth_hdr *ethhdr;
struct pbuf *p = NULL;
err_t err = ERR_OK;
mailbox_ptr_fetch(&(rtl8139if->mbox), (void**) &p);
if (poll) {
if (mailbox_ptr_tryfetch(&(rtl8139if->mbox), (void**) &p))
return err;
} else {
mailbox_ptr_fetch(&(rtl8139if->mbox), (void**) &p);
}
/* points to packet payload, which starts with an Ethernet header */
ethhdr = p->payload;

12
drivers/net/rtl8139.h
View file

@ -229,7 +229,17 @@ typedef struct rtl1839if {
mailbox_ptr_t mbox;
} rtl1839if_t;
err_t rtl8139if_poll(struct netif* netif);
/*
* Wait for incoming messages.
*
* poll = 0 : wait blocks until a message is received
* poll != 0: non-blocking wait
*/
err_t rtl8139if_wait(struct netif* netif, uint32_t poll);
/*
* Initialize the network driver for the RealTek RTL8139 family
*/
err_t rtl8139if_init(struct netif* netif);
#endif

2
kernel/Makefile
View file

@ -1,4 +1,4 @@
C_source = main.c tasks.c processor.c syscall.c tests.c echo.c ping.c
C_source = main.c tasks.c processor.c syscall.c tests.c echo.c ping.c net.c
OBJS += $(patsubst %.c, %.o, $(filter %.c, $(C_source)))

87
kernel/main.c
View file

@ -29,22 +29,9 @@
#include <asm/irq.h>
#include <asm/irqflags.h>
#include <asm/kb.h>
#ifdef CONFIG_PCI
#include <asm/pci.h>
#endif
#ifdef CONFIG_LWIP
#include <lwip/init.h>
#include <lwip/sys.h>
#include <lwip/stats.h>
#include <lwip/udp.h>
#include <lwip/tcp.h>
#include <lwip/dhcp.h>
#include <lwip/netif.h>
#include <netif/etharp.h>
#endif
#include <net/rtl8139.h>
extern int test_init(void);
extern int network_init(void);
/*
* Note that linker symbols are not variables, they have no memory allocated for
@ -89,73 +76,11 @@ static void list_root(void) {
list_fs(fs_root, 1);
}
#if defined(CONFIG_LWIP) && defined(CONFIG_PCI)
void echo_init(void);
void ping_init(void);
int STDCALL rtl8139if_task(void* arg)
{
struct netif netif;
struct ip_addr ipaddr;
struct ip_addr netmask;
struct ip_addr gw;
uint32_t mscnt = 0;
kputs("Network task is started\n");
/* Set network address variables */
//IP4_ADDR(&gw, 192,168,1,254);
//IP4_ADDR(&ipaddr, 192,168,1,100);
//IP4_ADDR(&netmask, 255,255,255,0);
/* Clear network address because we use DHCP to get an ip address */
IP4_ADDR(&gw, 0,0,0,0);
IP4_ADDR(&ipaddr, 0,0,0,0);
IP4_ADDR(&netmask, 0,0,0,0);
/* Clear the IP address, Subnet Mask, and Gateway */
ipaddr.addr = 0;
netmask.addr = 0;
gw.addr = 0;
/* Bring up the network interface */
if (!netif_add(&netif, &ipaddr, &netmask, &gw, NULL, rtl8139if_init, ethernet_input)) {
kputs("Unable to add network interface\n");
return -ENXIO;
}
netif_set_default(&netif);
if (netif_is_up(&netif)) {
kputs("Network interface is not up\n");
return -EIO;
}
kprintf("Starting DHCPCD...\n");
dhcp_start(&netif);
// start echo server
echo_init();
ping_init();
while(1) {
rtl8139if_poll(&netif);
}
dhcp_release(&netif);
dhcp_stop(&netif);
return 0;
}
#endif
int main(void)
{
#if defined(CONFIG_LWIP) && defined(CONFIG_PCI)
tid_t rtl8139_id;
#endif
kprintf("This is MetalSVM %s Build %u, %u, %u\n", METALSVM_VERSION, &__BUILD_VERSION, &__BUILD_DATE, &__BUILD_TIME);
lowlevel_init();
system_init();
irq_init();
timer_init();
@ -172,9 +97,7 @@ int main(void)
kprintf("Kernel starts at %p and ends at %p\n", &kernel_start, &kernel_end);
system_calibration();
#ifdef CONFIG_LWIP
lwip_init();
#endif
network_init();
kprintf("Processor frequency: %u MHz\n", get_cpu_frequency());
kprintf("Total memory: %u MBytes\n", atomic_int32_read(&total_pages)/((1024*1024)/PAGE_SIZE));
@ -185,10 +108,6 @@ int main(void)
list_root();
//test_init();
#if defined(CONFIG_LWIP) && defined(CONFIG_PCI)
create_kernel_task(&rtl8139_id, rtl8139if_task, NULL);
#endif
per_core(current_task)->status = TASK_IDLE;
reschedule();

125
kernel/net.c Normal file
View file

@ -0,0 +1,125 @@
/*
* Copyright 2010 Stefan Lankes, Chair for Operating Systems,
* RWTH Aachen University
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* This file is part of MetalSVM.
*/
#include <metalsvm/stddef.h>
#include <metalsvm/stdio.h>
#include <metalsvm/string.h>
#include <metalsvm/processor.h>
#include <metalsvm/time.h>
#include <metalsvm/tasks.h>
#include <metalsvm/errno.h>
#ifdef CONFIG_LWIP
#include <lwip/init.h>
#include <lwip/sys.h>
#include <lwip/stats.h>
#include <lwip/udp.h>
#include <lwip/tcp.h>
#include <lwip/dhcp.h>
#include <lwip/netif.h>
#include <netif/etharp.h>
#endif
#include <net/rtl8139.h>
void echo_init(void);
void ping_init(void);
static volatile int done = 0;
#if defined(CONFIG_LWIP) && defined(CONFIG_PCI)
static tid_t netid;
int STDCALL network_task(void* arg)
{
struct netif netif;
struct ip_addr ipaddr;
struct ip_addr netmask;
struct ip_addr gw;
kputs("Network task is started\n");
/* Set network address variables */
//IP4_ADDR(&gw, 192,168,1,254);
//IP4_ADDR(&ipaddr, 192,168,1,100);
//IP4_ADDR(&netmask, 255,255,255,0);
/* Clear network address because we use DHCP to get an ip address */
IP4_ADDR(&gw, 0,0,0,0);
IP4_ADDR(&ipaddr, 0,0,0,0);
IP4_ADDR(&netmask, 0,0,0,0);
/* Clear the IP address, Subnet Mask, and Gateway */
ipaddr.addr = 0;
netmask.addr = 0;
gw.addr = 0;
/* Bring up the network interface */
if (!netif_add(&netif, &ipaddr, &netmask, &gw, NULL, rtl8139if_init, ethernet_input)) {
kputs("Unable to add network interface\n");
return -ENXIO;
}
netif_set_default(&netif);
if (netif_is_up(&netif)) {
kputs("Network interface is not up\n");
return -EIO;
}
kprintf("Starting DHCPCD...\n");
dhcp_start(&netif);
/* wait for ip address */
while(!netif.ip_addr.addr) {
rtl8139if_wait(&netif, 1);
udelay(500000);
}
// start echo and ping server
echo_init();
ping_init();
while(!done) {
rtl8139if_wait(&netif, 0);
}
dhcp_release(&netif);
dhcp_stop(&netif);
return 0;
}
#endif
int network_shotdown(void)
{
done = 1;
return 0;
}
int network_init(void)
{
#if defined(CONFIG_LWIP)
lwip_init();
#endif
#if defined(CONFIG_LWIP) && defined(CONFIG_PCI)
return create_kernel_task(&netid, network_task, NULL);
#else
return 0;
#endif
}