Ticket #2016: 0001-SMC91111-ERC32-was-never-supported-by-driver.patch

File 0001-SMC91111-ERC32-was-never-supported-by-driver.patch, 2.0 KB (added by Daniel Hellstrom, on 02/10/12 at 07:31:44)

patch 2 for HEAD

  • c/src/lib/libbsp/sparc/leon2/include/bsp.h 

    From 646376bfd77403999971f5cfd79d7b5241876cb2 Mon Sep 17 00:00:00 2001
From: Daniel Hellstrom <daniel@gaisler.com>
Date: Mon, 28 Nov 2011 14:04:19 +0100
Subject: [PR 16 v2] SMC91111: ERC32 was never supported by driver

Moved the intelligence whether the driver is supported or not
completely to the BSP, now that bsp.h is included (even though it
is a driver... hmm). The ERC32 was never supported, so HAS_SMC91111
is not added to erc32/include/bsp.h.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
---
 c/src/lib/libbsp/sparc/leon2/include/bsp.h |    2 ++
 c/src/lib/libbsp/sparc/leon3/include/bsp.h |    2 ++
 c/src/libchip/network/smc91111.c           |    6 +-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
index b0695cb..b855347 100644
    a b extern int rtems_smc91111_driver_attach_leon2( 
    5858#define RTEMS_BSP_NETWORK_DRIVER_ATTACH_SMC91111 \
    5959          rtems_smc91111_driver_attach_leon2
    6060
     61#define HAS_SMC91111
     62
    6163/*
    6264 *  The synchronous trap is an arbitrarily chosen software trap.
    6365 */

  • c/src/lib/libbsp/sparc/leon3/include/bsp.h 

    diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h
index 70ab8b3..2286ad6 100644
    a b extern int rtems_leon_greth_driver_attach( 
    7171#define RTEMS_BSP_NETWORK_DRIVER_ATTACH RTEMS_BSP_NETWORK_DRIVER_ATTACH_GRETH
    7272#endif
    7373
     74#define HAS_SMC91111
     75
    7476extern int   CPU_SPARC_HAS_SNOOPING;
    7577
    7678

  • c/src/libchip/network/smc91111.c 

    diff --git a/c/src/libchip/network/smc91111.c b/c/src/libchip/network/smc91111.c
index 9313aa6..b4bb79f 100644
    a b  
    1515 *
    1616 */
    1717
    18 #if defined(__sparc__) || defined(HAS_SMC91111)
    19   #define SMC91111_SUPPORTED
    20 #endif
    21 
    22 #if defined(SMC91111_SUPPORTED)
     18#if defined(HAS_SMC91111)
    2319
    2420#include <stdlib.h>
    2521#include <stdio.h>