Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2012-07-20T18:14:55Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
b828907, be67118
Parents:
7030bc9 (diff), 32260a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge USB branch.

USB should be endian agnostic now.
OHCI and pci work on qemu powerpc, but pci locks up on real hw.
Hopefully no regressions on amd64/ia32.
Tested on qemu and Virtualbox.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/infrastructure/rootpc/rootpc.c

    r7030bc9 r6de2d766  
    7575};
    7676
    77 static hw_resource_t pci_conf_regs = {
    78         .type = IO_RANGE,
    79         .res.io_range = {
    80                 .address = 0xCF8,
    81                 .size = 8,
    82                 .endianness = LITTLE_ENDIAN
     77static hw_resource_t pci_conf_regs[] = {
     78        {
     79                .type = IO_RANGE,
     80                .res.io_range = {
     81                        .address = 0xCF8,
     82                        .size = 4,
     83                        .endianness = LITTLE_ENDIAN
     84                }
     85        },
     86        {
     87                .type = IO_RANGE,
     88                .res.io_range = {
     89                        .address = 0xCFC,
     90                        .size = 4,
     91                        .endianness = LITTLE_ENDIAN
     92                }
    8393        }
    8494};
     
    8696static rootpc_fun_t pci_data = {
    8797        .hw_resources = {
    88                 1,
    89                 &pci_conf_regs
     98                sizeof(pci_conf_regs)/sizeof(pci_conf_regs[0]),
     99                pci_conf_regs
    90100        }
    91101};
Note: See TracChangeset for help on using the changeset viewer.