Changeset 99e8fb7b in mainline for uspace/drv


Ignore:
Timestamp:
2013-12-31T19:08: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:
7f620e8
Parents:
a44424f
Message:

libdrv: Move pci_config client side to libdrv

Remove duplicate includes, duplicate enum definitions, …

Location:
uspace/drv
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/block/ahci/ahci.c

    ra44424f r99e8fb7b  
    3737#include <ddf/log.h>
    3838#include <device/hw_res_parsed.h>
    39 #include <device/pci.h>
     39#include <pci_dev_iface.h>
    4040#include <sysinfo.h>
    4141#include <ipc/irc.h>

  • uspace/drv/bus/pci/pciintel/pci.c

    ra44424f r99e8fb7b  
    153153
    154154
    155 static int pci_config_space_write_32(ddf_fun_t *fun, uint32_t address,
     155static int config_space_write_32(ddf_fun_t *fun, uint32_t address,
    156156    uint32_t data)
    157157{
    … …  
    162162}
    163163
    164 static int pci_config_space_write_16(
     164static int config_space_write_16(
    165165    ddf_fun_t *fun, uint32_t address, uint16_t data)
    166166{
    … …  
    171171}
    172172
    173 static int pci_config_space_write_8(
     173static int config_space_write_8(
    174174    ddf_fun_t *fun, uint32_t address, uint8_t data)
    175175{
    … …  
    180180}
    181181
    182 static int pci_config_space_read_32(
     182static int config_space_read_32(
    183183    ddf_fun_t *fun, uint32_t address, uint32_t *data)
    184184{
    … …  
    189189}
    190190
    191 static int pci_config_space_read_16(
     191static int config_space_read_16(
    192192    ddf_fun_t *fun, uint32_t address, uint16_t *data)
    193193{
    … …  
    198198}
    199199
    200 static int pci_config_space_read_8(
     200static int config_space_read_8(
    201201    ddf_fun_t *fun, uint32_t address, uint8_t *data)
    202202{
    … …  
    217217
    218218static pci_dev_iface_t pci_dev_ops = {
    219         .config_space_read_8 = &pci_config_space_read_8,
    220         .config_space_read_16 = &pci_config_space_read_16,
    221         .config_space_read_32 = &pci_config_space_read_32,
    222         .config_space_write_8 = &pci_config_space_write_8,
    223         .config_space_write_16 = &pci_config_space_write_16,
    224         .config_space_write_32 = &pci_config_space_write_32
     219        .config_space_read_8 = &config_space_read_8,
     220        .config_space_read_16 = &config_space_read_16,
     221        .config_space_read_32 = &config_space_read_32,
     222        .config_space_write_8 = &config_space_write_8,
     223        .config_space_write_16 = &config_space_write_16,
     224        .config_space_write_32 = &config_space_write_32
    225225};
    226226

  • uspace/drv/bus/usb/ehci/res.c

    ra44424f r99e8fb7b  
    4343#include <usb/debug.h>
    4444#include <device/hw_res_parsed.h>
    45 #include <device/pci.h>
     45#include <pci_dev_iface.h>
    4646
    4747#include "res.h"

  • uspace/drv/bus/usb/uhci/res.c

    ra44424f r99e8fb7b  
    3939#include <devman.h>
    4040#include <device/hw_res_parsed.h>
    41 #include <device/pci.h>
     41#include <pci_dev_iface.h>
    4242
    4343#include "res.h"

  • uspace/drv/nic/e1k/e1k.c

    ra44424f r99e8fb7b  
    5050#include <ddf/interrupt.h>
    5151#include <device/hw_res_parsed.h>
    52 #include <device/pci.h>
     52#include <pci_dev_iface.h>
    5353#include <nic.h>
    5454#include <ops/nic.h>

  • uspace/drv/nic/rtl8139/driver.c

    ra44424f r99e8fb7b  
    4141#include <io/log.h>
    4242#include <nic.h>
    43 #include <device/pci.h>
     43#include <pci_dev_iface.h>
    4444
    4545#include <ipc/irc.h>
    … …  
    190190        return;
    191191}
    192 
    193 #include <device/pci.h>
    194192
    195193/** Set PmEn (Power management enable) bit value
Note: See TracChangeset for help on using the changeset viewer.