lkml.org 
[lkml]   [2008]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 13/28] PNP: make resource option structures private to PNP subsystem
    Nothing outside the PNP subsystem should need access to a
    device's resource options, so this patch moves the option
    structure declarations to a private header file.

    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Acked-by: Rene Herman <rene.herman@gmail.com>

    Index: work14/drivers/pnp/base.h
    ===================================================================
    --- work14.orig/drivers/pnp/base.h 2008-06-17 14:40:28.000000000 -0600
    +++ work14/drivers/pnp/base.h 2008-06-17 14:42:28.000000000 -0600
    @@ -19,6 +19,54 @@ void pnp_remove_card(struct pnp_card *ca
    int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
    void pnp_remove_card_device(struct pnp_dev *dev);

    +struct pnp_port {
    + unsigned short min; /* min base number */
    + unsigned short max; /* max base number */
    + unsigned char align; /* align boundary */
    + unsigned char size; /* size of range */
    + unsigned char flags; /* port flags */
    + unsigned char pad; /* pad */
    + struct pnp_port *next; /* next port */
    +};
    +
    +#define PNP_IRQ_NR 256
    +struct pnp_irq {
    + DECLARE_BITMAP(map, PNP_IRQ_NR); /* bitmask for IRQ lines */
    + unsigned char flags; /* IRQ flags */
    + unsigned char pad; /* pad */
    + struct pnp_irq *next; /* next IRQ */
    +};
    +
    +struct pnp_dma {
    + unsigned char map; /* bitmask for DMA channels */
    + unsigned char flags; /* DMA flags */
    + struct pnp_dma *next; /* next port */
    +};
    +
    +struct pnp_mem {
    + unsigned int min; /* min base number */
    + unsigned int max; /* max base number */
    + unsigned int align; /* align boundary */
    + unsigned int size; /* size of range */
    + unsigned char flags; /* memory flags */
    + unsigned char pad; /* pad */
    + struct pnp_mem *next; /* next memory resource */
    +};
    +
    +#define PNP_RES_PRIORITY_PREFERRED 0
    +#define PNP_RES_PRIORITY_ACCEPTABLE 1
    +#define PNP_RES_PRIORITY_FUNCTIONAL 2
    +#define PNP_RES_PRIORITY_INVALID 65535
    +
    +struct pnp_option {
    + unsigned short priority; /* priority */
    + struct pnp_port *port; /* first port */
    + struct pnp_irq *irq; /* first IRQ */
    + struct pnp_dma *dma; /* first DMA */
    + struct pnp_mem *mem; /* first memory resource */
    + struct pnp_option *next; /* used to chain dependent resources */
    +};
    +
    struct pnp_option *pnp_build_option(int priority);
    struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev);
    struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
    Index: work14/include/linux/pnp.h
    ===================================================================
    --- work14.orig/include/linux/pnp.h 2008-06-17 14:41:18.000000000 -0600
    +++ work14/include/linux/pnp.h 2008-06-17 14:42:28.000000000 -0600
    @@ -182,54 +182,6 @@ static inline int pnp_dma_valid(struct p
    }


    -struct pnp_port {
    - unsigned short min; /* min base number */
    - unsigned short max; /* max base number */
    - unsigned char align; /* align boundary */
    - unsigned char size; /* size of range */
    - unsigned char flags; /* port flags */
    - unsigned char pad; /* pad */
    - struct pnp_port *next; /* next port */
    -};
    -
    -#define PNP_IRQ_NR 256
    -struct pnp_irq {
    - DECLARE_BITMAP(map, PNP_IRQ_NR); /* bitmask for IRQ lines */
    - unsigned char flags; /* IRQ flags */
    - unsigned char pad; /* pad */
    - struct pnp_irq *next; /* next IRQ */
    -};
    -
    -struct pnp_dma {
    - unsigned char map; /* bitmask for DMA channels */
    - unsigned char flags; /* DMA flags */
    - struct pnp_dma *next; /* next port */
    -};
    -
    -struct pnp_mem {
    - unsigned int min; /* min base number */
    - unsigned int max; /* max base number */
    - unsigned int align; /* align boundary */
    - unsigned int size; /* size of range */
    - unsigned char flags; /* memory flags */
    - unsigned char pad; /* pad */
    - struct pnp_mem *next; /* next memory resource */
    -};
    -
    -#define PNP_RES_PRIORITY_PREFERRED 0
    -#define PNP_RES_PRIORITY_ACCEPTABLE 1
    -#define PNP_RES_PRIORITY_FUNCTIONAL 2
    -#define PNP_RES_PRIORITY_INVALID 65535
    -
    -struct pnp_option {
    - unsigned short priority; /* priority */
    - struct pnp_port *port; /* first port */
    - struct pnp_irq *irq; /* first IRQ */
    - struct pnp_dma *dma; /* first DMA */
    - struct pnp_mem *mem; /* first memory resource */
    - struct pnp_option *next; /* used to chain dependent resources */
    -};
    -
    /*
    * Device Management
    */
    --


    \
     
     \ /
      Last update: 2008-06-18 01:07    [W:0.032 / U:3.284 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site