Changeset f902d36 in mainline


Ignore:
Timestamp:
2011-01-11T12:04:06Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
04aade50
Parents:
597c948
Message:

rename the dp8390 driver (and everything related) to ne2000
as it is currently a more suitable name for this beast

Files:
14 edited
4 moved

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r597c948 rf902d36  
    9898        $(USPACE_PATH)/srv/fs/fat/fat \
    9999        $(USPACE_PATH)/srv/taskmon/taskmon \
    100         $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
     100        $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
    101101        $(USPACE_PATH)/srv/net/netif/lo/lo \
    102102        $(USPACE_PATH)/srv/net/nil/eth/eth \

  • kernel/arch/amd64/include/interrupt.h

    r597c948 rf902d36  
    5555#define IRQ_PIC_SPUR  7
    5656#define IRQ_MOUSE     12
    57 #define IRQ_DP8390    9
     57#define IRQ_NE2000    9
    5858
    5959/* This one must have four least significant bits set to ones */

  • kernel/arch/amd64/src/amd64.c

    r597c948 rf902d36  
    238238                sysinfo_set_item_val(irqs_info, NULL, true);
    239239       
    240         sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
     240        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
    241241}
    242242

  • kernel/arch/ia32/include/interrupt.h

    r597c948 rf902d36  
    5555#define IRQ_PIC_SPUR  7
    5656#define IRQ_MOUSE     12
    57 #define IRQ_DP8390    5
     57#define IRQ_NE2000    5
    5858
    5959/* This one must have four least significant bits set to ones */

  • kernel/arch/ia32/src/ia32.c

    r597c948 rf902d36  
    196196                sysinfo_set_item_val(irqs_info, NULL, true);
    197197       
    198         sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
     198        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
    199199}
    200200

  • kernel/arch/ia64/include/interrupt.h

    r597c948 rf902d36  
    6161#define IRQ_KBD    (0x01 + LEGACY_INTERRUPT_BASE)
    6262#define IRQ_MOUSE  (0x0c + LEGACY_INTERRUPT_BASE)
    63 #define IRQ_DP8390 (0x09 + LEGACY_INTERRUPT_BASE)
     63#define IRQ_NE2000 (0x09 + LEGACY_INTERRUPT_BASE)
    6464
    6565/** General Exception codes. */

  • kernel/arch/ia64/src/ia64.c

    r597c948 rf902d36  
    222222#endif
    223223
    224         sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
     224        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
    225225
    226226        sysinfo_set_item_val("ia64_iospace", NULL, true);

  • uspace/Makefile

    r597c948 rf902d36  
    8080        srv/hw/char/i8042 \
    8181        srv/hw/char/s3c24xx_uart \
    82         srv/hw/netif/dp8390 \
     82        srv/hw/netif/ne2000 \
    8383        srv/net/netif/lo \
    8484        srv/net/il/arp \

  • uspace/doc/doxygroups.h

    r597c948 rf902d36  
    4343
    4444                        /**
    45                          * @defgroup dp8390 Generic DP8390 network interface family service
     45                         * @defgroup ne2000 NE2000 network interface service
    4646                         * @ingroup netif
    4747                         */
    48 
    49                                 /**
    50                                  * @defgroup ne2k NE2000 network interface family
    51                                  * @ingroup dp8390
    52                                  */
    5348
    5449                /**

  • uspace/lib/c/include/ipc/services.h

    r597c948 rf902d36  
    5454        SERVICE_NETWORKING,
    5555        SERVICE_LO,
    56         SERVICE_DP8390,
     56        SERVICE_NE2000,
    5757        SERVICE_ETHERNET,
    5858        SERVICE_NILDUMMY,

  • uspace/lib/net/generic/protocol_map.c

    r597c948 rf902d36  
    5050        switch (nil) {
    5151        case SERVICE_ETHERNET:
    52         case SERVICE_DP8390:
     52        case SERVICE_NE2000:
    5353                switch (il) {
    5454                case SERVICE_IP:
    … …  
    7676        switch (nil) {
    7777        case SERVICE_ETHERNET:
    78         case SERVICE_DP8390:
     78        case SERVICE_NE2000:
    7979                switch (protocol) {
    8080                case ETH_P_IP:
    … …  
    139139        switch (nil) {
    140140        case SERVICE_ETHERNET:
    141         case SERVICE_DP8390:
     141        case SERVICE_NE2000:
    142142                return HW_ETHER;
    143143        default:

  • uspace/srv/hw/netif/ne2000/Makefile

    r597c948 rf902d36  
    3939-include $(CONFIG_MAKEFILE)
    4040
    41 BINARY = dp8390
     41BINARY = ne2000
    4242
    4343SOURCES = \

  • uspace/srv/hw/netif/ne2000/ne2000.c

    r597c948 rf902d36  
    7878static int irc_phone = -1;
    7979
    80 /** DP8390 kernel interrupt command sequence.
     80/** NE2000 kernel interrupt command sequence.
    8181 *
    8282 */
    … …  
    128128};
    129129
    130 /** DP8390 kernel interrupt code.
     130/** NE2000 kernel interrupt code.
    131131 *
    132132 */
    … …  
    398398       
    399399        sysarg_t phonehash;
    400         return ipc_connect_to_me(PHONE_NS, SERVICE_DP8390, 0, 0, &phonehash);
     400        return ipc_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, &phonehash);
    401401}
    402402

  • uspace/srv/net/cfg/ne2k

    r597c948 rf902d36  
    1 # DP8390 (NE2k) configuration
     1# NE2000 configuration
    22
    33NAME=ne2k
    44
    5 NETIF=dp8390
     5NETIF=ne2000
    66NIL=eth
    77IL=ip
    … …  
    1515
    1616IP_CONFIG=static
    17 IP_ADDR=10.0.2.15
     17IP_ADDR=10.10.16.86
    1818IP_ROUTING=yes
    19 IP_NETMASK=255.255.255.240
    20 IP_BROADCAST=10.0.2.255
    21 IP_GATEWAY=10.0.2.2
     19IP_NETMASK=255.255.255.0
     20IP_BROADCAST=10.10.16.255
     21IP_GATEWAY=10.10.16.1
    2222ARP=arp
    2323

  • uspace/srv/net/net/net.c

    r597c948 rf902d36  
    288288        if (rc != EOK)
    289289                return rc;
    290         rc = add_module(NULL, &net_globals.modules, (uint8_t *) DP8390_NAME,
    291             (uint8_t *) DP8390_FILENAME, SERVICE_DP8390, 0, connect_to_service);
     290        rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME,
     291            (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service);
    292292        if (rc != EOK)
    293293                return rc;

  • uspace/srv/net/net/net.h

    r597c948 rf902d36  
    5252 */
    5353
    54 #define DP8390_FILENAME  "/srv/dp8390"
    55 #define DP8390_NAME      "dp8390"
     54#define NE2000_FILENAME  "/srv/ne2000"
     55#define NE2000_NAME      "ne2000"
    5656
    5757#define ETHERNET_FILENAME  "/srv/eth"
Note: See TracChangeset for help on using the changeset viewer.