Changeset b0b4592e in mainline for uspace/drv


Ignore:
Timestamp:
2014-03-15T19:21:53Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c773adc
Parents:
2034f98 (diff), 8cffdf5 (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 mainline changes

Location:
uspace/drv
Files:
11 added
8 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r2034f98 rb0b4592e  
    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>
    … …  
    111111        }
    112112
    113 static int ahci_get_sata_device_name(ddf_fun_t *, size_t, char *);
    114 static int ahci_get_num_blocks(ddf_fun_t *, uint64_t *);
    115 static int ahci_get_block_size(ddf_fun_t *, size_t *);
    116 static int ahci_read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
    117 static int ahci_write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
     113static int get_sata_device_name(ddf_fun_t *, size_t, char *);
     114static int get_num_blocks(ddf_fun_t *, uint64_t *);
     115static int get_block_size(ddf_fun_t *, size_t *);
     116static int read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
     117static int write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
    118118
    119119static int ahci_identify_device(sata_dev_t *);
    … …  
    139139
    140140static ahci_iface_t ahci_interface = {
    141         .get_sata_device_name = &ahci_get_sata_device_name,
    142         .get_num_blocks = &ahci_get_num_blocks,
    143         .get_block_size = &ahci_get_block_size,
    144         .read_blocks = &ahci_read_blocks,
    145         .write_blocks = &ahci_write_blocks
     141        .get_sata_device_name = &get_sata_device_name,
     142        .get_num_blocks = &get_num_blocks,
     143        .get_block_size = &get_block_size,
     144        .read_blocks = &read_blocks,
     145        .write_blocks = &write_blocks
    146146};
    147147
    … …  
    180180 *
    181181 */
    182 static int ahci_get_sata_device_name(ddf_fun_t *fun,
     182static int get_sata_device_name(ddf_fun_t *fun,
    183183    size_t sata_dev_name_length, char *sata_dev_name)
    184184{
    … …  
    196196 *
    197197 */
    198 static int ahci_get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
     198static int get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
    199199{
    200200        sata_dev_t *sata = fun_sata_dev(fun);
    … …  
    211211 *
    212212 */
    213 static int ahci_get_block_size(ddf_fun_t *fun, size_t *block_size)
     213static int get_block_size(ddf_fun_t *fun, size_t *block_size)
    214214{
    215215        sata_dev_t *sata = fun_sata_dev(fun);
    … …  
    228228 *
    229229 */
    230 static int ahci_read_blocks(ddf_fun_t *fun, uint64_t blocknum,
     230static int read_blocks(ddf_fun_t *fun, uint64_t blocknum,
    231231    size_t count, void *buf)
    232232{
    … …  
    271271 *
    272272 */
    273 static int ahci_write_blocks(ddf_fun_t *fun, uint64_t blocknum,
     273static int write_blocks(ddf_fun_t *fun, uint64_t blocknum,
    274274    size_t count, void *buf)
    275275{

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

    r2034f98 rb0b4592e  
    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

    r2034f98 rb0b4592e  
    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

    r2034f98 rb0b4592e  
    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/char/grlib_uart/cyclic_buffer.h

    r2034f98 rb0b4592e  
    11/*
    2  * Copyright (c) 2011 Jiri Michalec
     2 * Copyright (c) 2010 Lenka Trochtova
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup libc
     29/** @addtogroup ns8250
    3030 * @{
    3131 */
    … …  
    3333 */
    3434
    35 #ifndef LIBC_DEVICE_PCI_H_
    36 #define LIBC_DEVICE_PCI_H_
     35#ifndef CYCLIC_BUFFER_H_
     36#define CYCLIC_BUFFER_H_
    3737
    38 #include <async.h>
     38#define BUF_LEN 4096
    3939
    40 #define PCI_DEVICE_ID  0x02
     40typedef struct cyclic_buffer {
     41        uint8_t buf[BUF_LEN];
     42        int start;
     43        int cnt;
     44}  cyclic_buffer_t;
    4145
    42 typedef enum {
    43         IPC_M_CONFIG_SPACE_READ_8,
    44         IPC_M_CONFIG_SPACE_READ_16,
    45         IPC_M_CONFIG_SPACE_READ_32,
     46/*
     47 * @return              False if the buffer is full.
     48 */
     49static inline bool buf_push_back(cyclic_buffer_t *buf, uint8_t item)
     50{
     51        if (buf->cnt >= BUF_LEN)
     52                return false;
    4653       
    47         IPC_M_CONFIG_SPACE_WRITE_8,
    48         IPC_M_CONFIG_SPACE_WRITE_16,
    49         IPC_M_CONFIG_SPACE_WRITE_32
    50 } pci_dev_iface_funcs_t;
     54        int pos = (buf->start + buf->cnt) % BUF_LEN;
     55        buf->buf[pos] = item;
     56        buf->cnt++;
     57        return true;
     58}
    5159
    52 extern int pci_config_space_read_8(async_sess_t *, uint32_t, uint8_t *);
    53 extern int pci_config_space_read_16(async_sess_t *, uint32_t, uint16_t *);
    54 extern int pci_config_space_read_32(async_sess_t *, uint32_t, uint32_t *);
     60static inline bool buf_is_empty(cyclic_buffer_t *buf)
     61{
     62        return buf->cnt == 0;
     63}
    5564
    56 extern int pci_config_space_write_8(async_sess_t *, uint32_t, uint8_t);
    57 extern int pci_config_space_write_16(async_sess_t *, uint32_t, uint16_t);
    58 extern int pci_config_space_write_32(async_sess_t *, uint32_t, uint32_t);
     65static inline uint8_t buf_pop_front(cyclic_buffer_t *buf)
     66{
     67        assert(!buf_is_empty(buf));
     68       
     69        uint8_t res = buf->buf[buf->start];
     70        buf->start = (buf->start + 1) % BUF_LEN;
     71        buf->cnt--;
     72        return res;
     73}
     74
     75static inline void buf_clear(cyclic_buffer_t *buf)
     76{
     77        buf->cnt = 0;
     78}
    5979
    6080#endif
    6181
    62 /** @}
     82/**
     83 * @}
    6384 */

  • uspace/drv/infrastructure/rootmalta/rootmalta.c

    r2034f98 rb0b4592e  
    5252#include <ipc/dev_iface.h>
    5353#include <ops/hw_res.h>
    54 #include <device/hw_res.h>
    5554#include <ops/pio_window.h>
    56 #include <device/pio_window.h>
    5755#include <byteorder.h>
    5856

  • uspace/drv/infrastructure/rootpc/rootpc.c

    r2034f98 rb0b4592e  
    5050#include <ipc/dev_iface.h>
    5151#include <ops/hw_res.h>
    52 #include <device/hw_res.h>
    5352#include <ops/pio_window.h>
    54 #include <device/pio_window.h>
    5553
    5654#define NAME "rootpc"

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

    r2034f98 rb0b4592e  
    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

    r2034f98 rb0b4592e  
    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.