Changeset 36ebd68 in rtems-libbsd


Ignore:
Timestamp:
Jun 29, 2012, 5:42:00 PM (7 years ago)
Author:
Jennifer Averett <jennifer.averett@…>
Branches:
4.11, c1e05b9ea378b2971e3d7704779112b4bc4296da, freebsd-9.3, 4a77611a223ea883fb548679b516d326a020d447
Children:
8b588ff
Parents:
58ea5ee
Message:

Added legacy in order to get pcib to work correctly and resoleved fxp attach issue.
The fxp attach has a resource allocation issue still to address, but
should work as soon as that is debugged.

Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r58ea5ee r36ebd68  
    5959C_FILES += rtemsbsd/src/rtems-bsd-conf.c
    6060C_FILES += rtemsbsd/src/rtems-bsd-subr_param.c
     61C_FILES += rtemsbsd/src/rtems-bsd-pci_cfgreg.c
     62C_FILES += rtemsbsd/src/rtems-bsd-pci_bus.c
    6163C_FILES += freebsd/kern/subr_eventhandler.c
    6264C_FILES += freebsd/kern/kern_subr.c
     
    388390ifeq ($(RTEMS_CPU), i386)
    389391C_FILES += freebsd/i386/pci/pci_bus.c
     392C_FILES += freebsd/i386/i386/legacy.c
    390393endif
    391394C_FILES += freebsd/dev/re/if_re.c
  • freebsd-to-rtems.py

    r58ea5ee r36ebd68  
    554554                'src/rtems-bsd-conf.c',
    555555                'src/rtems-bsd-subr_param.c',
     556                'src/rtems-bsd-pci_cfgreg.c',
     557                'src/rtems-bsd-pci_bus.c',
    556558        ]
    557559)
     
    12141216        [
    12151217                'i386/pci/pci_bus.c',
     1218                'i386/i386/legacy.c',
    12161219        ]
    12171220)
  • freebsd/dev/pci/pci_pci.c

    r58ea5ee r36ebd68  
    247247        break;
    248248
     249#ifndef __rtems__
    249250    /* Compaq R3000 BIOS sets wrong subordinate bus number. */
    250251    case 0x00dd10de:
     
    272273            break;
    273274        }
     275#endif /* __rtems__ */
    274276    }
    275277
  • freebsd/i386/pci/pci_bus.c

    r58ea5ee r36ebd68  
    5353#include <freebsd/local/pcib_if.h>
    5454
     55#ifndef __rtems__
    5556static int      pcibios_pcib_route_interrupt(device_t pcib, device_t dev,
    5657    int pin);
     58#else /* __rtems__ */
     59int     pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin);
     60#endif /* __rtems__ */
     61
    5762
    5863int
     
    481486         */
    482487        bus = pcib_get_bus(dev);
     488#ifndef __rtems__
    483489        if (pci_pir_probe(bus, 0)) {
    484490                pir = BUS_ADD_CHILD(device_get_parent(dev), 0, "pir", 0);
     
    486492                        device_probe_and_attach(pir);
    487493        }
     494#else /* __rtems__ */
     495#endif /* __rtems__ */
    488496        device_add_child(dev, "pci", bus);
    489497        return bus_generic_attach(dev);
     
    594602
    595603
     604#ifndef __rtems__
    596605/*
    597606 * Install placeholder to claim the resources owned by the
     
    712721                pci_get_function(dev), pin));
    713722}
     723#endif /* __rtems__ */
  • rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h

    r58ea5ee r36ebd68  
    6060
    6161#define SYSINIT_NEED_PCIB \
    62         SYSINIT_REFERENCE(p0init); \
     62        SYSINIT_DRIVER_REFERENCE(legacy, nexus); \
     63        SYSINIT_DRIVER_REFERENCE(pcib, legacy);  \
    6364        SYSINIT_DRIVER_REFERENCE(pci, pcib);
    6465
  • testsuite/link01/test.c

    r58ea5ee r36ebd68  
    4848#include <freebsd/machine/rtems-bsd-sysinit.h>
    4949
    50 /*
    51  *  User says I need XXX
    52  */
    53 #define CONFIGURE_NEED_NET
    54 #define CONFIGURE_NEED_PCIB
    55 #define CONFIGURE_NEED_NET_IF_FXP
    56 
    57 /*
    58  *  We "read" that and generate references and nexus devices
    59  */
    60 #if defined(CONFIGURE_NEED_NET)
    61   SYSINIT_NEED_FREEBSD_CORE;
    62 #endif
    63 
    64   SYSINIT_NEED_USB_CORE;
    65 #if defined(CONFIGURE_NEED_PCIB)
    66   SYSINIT_NEED_PCIB;
    67 #endif
    68 
    69 #if defined(CONFIGURE_NEED_NET_IF_FXP)
    70   SYSINIT_NEED_NET_IF_FXP;
    71 #endif
    72 #if defined(CONFIGURE_NEED_NET_IF_DC)
    73   SYSINIT_NEED_NET_IF_DC;
    74 #endif
    75 
    76 #if 0
    77 SYSINIT_NEED_NET_IF_BFE;
    78 SYSINIT_NEED_NET_IF_RE;
    79 SYSINIT_NEED_NET_IF_EM;
    80 SYSINIT_NEED_NET_IF_IGB;
    81 SYSINIT_NEED_NET_IF_BCE;
    82 SYSINIT_NEED_NET_IF_LEM;
    83 
    84 SYSINIT_NEED_NET_IF_BGE; // does not link 23 May 2012
    85 #endif
    86 
    87 
    88 const char *const _bsd_nexus_devices [] = {
    89         #if defined(CONFIGURE_NEED_PCIB)
    90                 "pcib",
    91         #endif
    92         #if defined(CONFIGURE_NEED_NET_IF_FXP)
    93                 "fxp",
    94         #endif
    95         NULL
    96 };
     50#include "nic-sysinit.h"
    9751
    9852/* end of file */
Note: See TracChangeset for help on using the changeset viewer.