Changeset cb3dbb63 in mainline


Ignore:
Timestamp:
2012-01-24T04:29:48Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
70922c2
Parents:
690d2e7
Message:

ppc32: Use intelpci as pci driver.

It works if the pci bus is set to little endian, like on qemu.
MPC 106 used in powermacs can work in both little and big endian (don't know what the switch is)

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/ppc32/Makefile.inc

    r690d2e7 rcb3dbb63  
    4343
    4444RD_DRVS += \
    45         infrastructure/rootmac
     45        infrastructure/rootmac \
     46        bus/pci/pciintel
    4647
    4748SOURCES = \

  • uspace/Makefile

    r690d2e7 rcb3dbb63  
    165165        DIRS += \
    166166                drv/infrastructure/rootmac \
     167                drv/bus/pci/pciintel \
    167168                srv/hw/bus/cuda_adb
    168169endif

  • uspace/drv/infrastructure/rootmac/rootmac.c

    r690d2e7 rcb3dbb63  
    5252} rootmac_fun_t;
    5353
    54 static hw_resource_t pci_conf_regs = {
    55         .type = IO_RANGE,
    56         .res.io_range = {
    57                 .address = 0xCF8,
    58                 .size = 8,
    59                 .endianness = LITTLE_ENDIAN
     54static hw_resource_t pci_conf_regs[] = {
     55        {
     56                .type = IO_RANGE,
     57                .res.io_range = {
     58                        .address = 0xfec00000,
     59                        .size = 4,
     60                        .endianness = LITTLE_ENDIAN
     61                }
     62        },
     63        {
     64                .type = IO_RANGE,
     65                .res.io_range = {
     66                        .address = 0xfee00000,
     67                        .size = 4,
     68                        .endianness = LITTLE_ENDIAN
     69                }
    6070        }
    6171};
    … …  
    6373static rootmac_fun_t pci_data = {
    6474        .hw_resources = {
    65                 1,
    66                 &pci_conf_regs
     75                2,
     76                pci_conf_regs
    6777        }
    6878};
    … …  
    128138{
    129139        /* Register functions */
    130         if (!rootmac_add_fun(dev, "pci0", "pangea_pci", &pci_data))
     140        if (!rootmac_add_fun(dev, "pci0", "intel_pci", &pci_data))
    131141                ddf_msg(LVL_ERROR, "Failed to add functions for Mac platform.");
    132142       
Note: See TracChangeset for help on using the changeset viewer.