Changeset af6b5157 in mainline


Ignore:
Timestamp:
2011-02-15T20:09:24Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2a770a35
Parents:
83a2f43
Message:

Split driver.h into ddf/driver.h and ddf/interrupt.h.

Location:
uspace
Files:
15 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/drv/isa/isa.c

    r83a2f43 raf6b5157  
    5252#include <sys/stat.h>
    5353
    54 #include <driver.h>
     54#include <ddf/driver.h>
    5555#include <ops/hw_res.h>
    5656

  • uspace/drv/ns8250/ns8250.c

    r83a2f43 raf6b5157  
    5353#include <libarch/ddi.h>
    5454
    55 #include <driver.h>
     55#include <ddf/driver.h>
     56#include <ddf/interrupt.h>
    5657#include <ops/char_dev.h>
    5758

  • uspace/drv/pciintel/pci.c

    r83a2f43 raf6b5157  
    4747#include <str_error.h>
    4848
    49 #include <driver.h>
     49#include <ddf/driver.h>
    5050#include <devman.h>
    5151#include <ipc/devman.h>

  • uspace/drv/pciintel/pci.h

    r83a2f43 raf6b5157  
    3737#define PCI_H_
    3838
    39 #include <stdlib.h>
    40 #include <driver.h>
    41 #include <malloc.h>
    42 
     39#include <ddf/driver.h>
    4340#include "pci_regs.h"
    4441

  • uspace/drv/root/root.c

    r83a2f43 raf6b5157  
    5151#include <sysinfo.h>
    5252
    53 #include <driver.h>
     53#include <ddf/driver.h>
    5454#include <devman.h>
    5555#include <ipc/devman.h>

  • uspace/drv/rootpc/rootpc.c

    r83a2f43 raf6b5157  
    4646#include <macros.h>
    4747
    48 #include <driver.h>
     48#include <ddf/driver.h>
    4949#include <devman.h>
    5050#include <ipc/devman.h>

  • uspace/drv/rootvirt/rootvirt.c

    r83a2f43 raf6b5157  
    3939#include <errno.h>
    4040#include <str_error.h>
    41 #include <driver.h>
     41#include <ddf/driver.h>
    4242
    4343#define NAME "rootvirt"

  • uspace/drv/test1/test1.c

    r83a2f43 raf6b5157  
    3434#include <errno.h>
    3535#include <str_error.h>
     36#include <ddf/driver.h>
     37
    3638#include "test1.h"
    3739

  • uspace/drv/test1/test1.h

    r83a2f43 raf6b5157  
    3232#define DRV_TEST1_TEST1_H_
    3333
    34 #include <driver.h>
     34#include <ddf/driver.h>
    3535
    3636#define NAME "test1"

  • uspace/drv/test2/test2.c

    r83a2f43 raf6b5157  
    3131
    3232#include <assert.h>
     33#include <async.h>
    3334#include <stdio.h>
    3435#include <errno.h>
    3536#include <str_error.h>
    36 #include <driver.h>
     37#include <ddf/driver.h>
    3738
    3839#define NAME "test2"

  • uspace/lib/drv/generic/driver.c

    r83a2f43 raf6b5157  
    5050#include <errno.h>
    5151#include <inttypes.h>
     52#include <devman.h>
    5253
    5354#include <ipc/driver.h>
    5455
    5556#include "dev_iface.h"
    56 #include "driver.h"
     57#include "ddf/driver.h"
     58#include "ddf/interrupt.h"
    5759
    5860/** Driver structure */
    … …  
    7981static ddf_dev_t *create_device(void);
    8082static void delete_device(ddf_dev_t *);
     83static remote_handler_t *function_get_default_handler(ddf_fun_t *);
     84static void *function_get_ops(ddf_fun_t *, dev_inferface_idx_t);
    8185
    8286static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall)
    … …  
    570574}
    571575
    572 void *function_get_ops(ddf_fun_t *fun, dev_inferface_idx_t idx)
     576static void *function_get_ops(ddf_fun_t *fun, dev_inferface_idx_t idx)
    573577{
    574578        assert(is_valid_iface_idx(idx));
    … …  
    638642
    639643/** Get default handler for client requests */
    640 remote_handler_t *function_get_default_handler(ddf_fun_t *fun)
     644static remote_handler_t *function_get_default_handler(ddf_fun_t *fun)
    641645{
    642646        if (fun->ops == NULL)

  • uspace/lib/drv/generic/remote_char_dev.c

    r83a2f43 raf6b5157  
    3737
    3838#include "ops/char_dev.h"
    39 #include "driver.h"
     39#include "ddf/driver.h"
    4040
    4141#define MAX_CHAR_RW_COUNT 256

  • uspace/lib/drv/generic/remote_hw_res.c

    r83a2f43 raf6b5157  
    3737
    3838#include "ops/hw_res.h"
    39 #include "driver.h"
     39#include "ddf/driver.h"
    4040
    4141static void remote_hw_res_get_resource_list(ddf_fun_t *, void *, ipc_callid_t,

  • uspace/lib/drv/include/ddf/driver.h

    r83a2f43 raf6b5157  
    11/*
    22 * Copyright (c) 2010 Lenka Trochtova
     3 * Copyright (c) 2011 Jiri Svoboda
    34 * All rights reserved.
    45 *
    … …  
    3334 */
    3435
    35 #ifndef LIBDRV_DRIVER_H_
    36 #define LIBDRV_DRIVER_H_
     36#ifndef DDF_DRIVER_H_
     37#define DDF_DRIVER_H_
    3738
    38 #include <kernel/ddi/irq.h>
    39 #include <adt/list.h>
    40 #include <devman.h>
    4139#include <ipc/devman.h>
    4240#include <ipc/dev_iface.h>
    43 #include <assert.h>
    44 #include <ddi.h>
    45 #include <libarch/ddi.h>
    46 #include <fibril_synch.h>
    47 #include <malloc.h>
    4841
    49 #include "dev_iface.h"
     42#include "../dev_iface.h"
    5043
    5144typedef struct ddf_dev ddf_dev_t;
    … …  
    5346
    5447/*
    55  * Device class
     48 * Device
    5649 */
    5750
    … …  
    8073        remote_handler_t *default_handler;
    8174} ddf_dev_ops_t;
    82 
    83 /*
    84  * Device
    85  */
    8675
    8776/** Device structure */
    … …  
    160149extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int);
    161150
    162 extern void *function_get_ops(ddf_fun_t *, dev_inferface_idx_t);
    163 
    164 /*
    165  * Interrupts
    166  */
    167 
    168 typedef void interrupt_handler_t(ddf_dev_t *, ipc_callid_t, ipc_call_t *);
    169 
    170 typedef struct interrupt_context {
    171         int id;
    172         ddf_dev_t *dev;
    173         int irq;
    174         interrupt_handler_t *handler;
    175         link_t link;
    176 } interrupt_context_t;
    177 
    178 typedef struct interrupt_context_list {
    179         int curr_id;
    180         link_t contexts;
    181         fibril_mutex_t mutex;
    182 } interrupt_context_list_t;
    183 
    184 extern interrupt_context_t *create_interrupt_context(void);
    185 extern void delete_interrupt_context(interrupt_context_t *);
    186 extern void init_interrupt_context_list(interrupt_context_list_t *);
    187 extern void add_interrupt_context(interrupt_context_list_t *,
    188     interrupt_context_t *);
    189 extern void remove_interrupt_context(interrupt_context_list_t *,
    190     interrupt_context_t *);
    191 extern interrupt_context_t *find_interrupt_context_by_id(
    192     interrupt_context_list_t *, int);
    193 extern interrupt_context_t *find_interrupt_context(
    194     interrupt_context_list_t *, ddf_dev_t *, int);
    195 
    196 extern int register_interrupt_handler(ddf_dev_t *, int, interrupt_handler_t *,
    197     irq_code_t *);
    198 extern int unregister_interrupt_handler(ddf_dev_t *, int);
    199 
    200 extern remote_handler_t *function_get_default_handler(ddf_fun_t *);
    201151extern int ddf_fun_add_to_class(ddf_fun_t *fun, const char *class_name);
    202152

  • uspace/lib/drv/include/ops/char_dev.h

    r83a2f43 raf6b5157  
    3636#define LIBDRV_OPS_CHAR_DEV_H_
    3737
    38 #include "../driver.h"
     38#include "../ddf/driver.h"
    3939
    4040typedef struct {

  • uspace/lib/drv/include/ops/hw_res.h

    r83a2f43 raf6b5157  
    3939#include <sys/types.h>
    4040
    41 #include "../driver.h"
     41#include "../ddf/driver.h"
    4242
    4343typedef struct {
Note: See TracChangeset for help on using the changeset viewer.