Changeset 233af8c5 in mainline


Ignore:
Timestamp:
2006-10-03T22:49:10Z (18 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e2cc9a0
Parents:
0b414b5
Message:

Rename INO to INR, for the sake of consistency with manuals.

Location:
kernel
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/include/drivers/fhc.h

    r0b414b5 r233af8c5  
    4646
    4747extern fhc_t *fhc_init(ofw_tree_node_t *node);
    48 extern void fhc_enable_interrupt(fhc_t *fhc, int ino);
    49 extern void fhc_clear_interrupt(fhc_t *fhc, int ino);
     48extern void fhc_enable_interrupt(fhc_t *fhc, int inr);
     49extern void fhc_clear_interrupt(fhc_t *fhc, int inr);
    5050
    5151#endif

  • kernel/arch/sparc64/src/drivers/fhc.c

    r0b414b5 r233af8c5  
    5555 * and get the complete mapping.
    5656 */
    57 #define FHC_UART_INO    0x39   
     57#define FHC_UART_INR    0x39   
    5858
    5959#define FHC_UART_IMAP   0x0
    … …  
    9191}
    9292
    93 void fhc_enable_interrupt(fhc_t *fhc, int ino)
     93void fhc_enable_interrupt(fhc_t *fhc, int inr)
    9494{
    95         switch (ino) {
    96         case FHC_UART_INO:
     95        switch (inr) {
     96        case FHC_UART_INR:
    9797                fhc->uart_imap[FHC_UART_ICLR] = 0x0;
    9898                fhc->uart_imap[FHC_UART_IMAP] = 0x80000000;
    9999                break;
    100100        default:
    101                 panic("Unexpected INO (%d)\n", ino);
     101                panic("Unexpected INR (%d)\n", inr);
    102102                break;
    103103        }
    104104}
    105105
    106 void fhc_clear_interrupt(fhc_t *fhc, int ino)
     106void fhc_clear_interrupt(fhc_t *fhc, int inr)
    107107{
    108108        ASSERT(fhc->uart_imap);
    109109
    110         switch (ino) {
    111         case FHC_UART_INO:
     110        switch (inr) {
     111        case FHC_UART_INR:
    112112                fhc->uart_imap[FHC_UART_ICLR] = 0;
    113113                break;
    114114        default:
    115                 panic("Unexpected INO (%d)\n", ino);
     115                panic("Unexpected INR (%d)\n", inr);
    116116                break;
    117117        }

  • kernel/genarch/include/ofw/ofw_tree.h

    r0b414b5 r233af8c5  
    116116        uint32_t intr;
    117117        uint32_t controller_handle;
    118         uint32_t controller_ino;
     118        uint32_t controller_inr;
    119119} __attribute__ ((packed));
    120120typedef struct ofw_ebus_intr_map ofw_ebus_intr_map_t;
    … …  
    166166extern bool ofw_pci_reg_absolutize(ofw_tree_node_t *node, ofw_pci_reg_t *reg, ofw_pci_reg_t *out);
    167167
    168 extern bool ofw_fhc_map_interrupts(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *ino);
    169 extern bool ofw_ebus_map_interrupts(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *ino);
     168extern bool ofw_fhc_map_interrupts(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *inr);
     169extern bool ofw_ebus_map_interrupts(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *inr);
    170170
    171171#endif

  • kernel/genarch/src/ofw/ebus.c

    r0b414b5 r233af8c5  
    7575}
    7676
    77 bool ofw_ebus_map_interrupts(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *ino)
     77bool ofw_ebus_map_interrupts(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *inr)
    7878{
    7979        ofw_tree_property_t *prop;
    … …  
    112112        /*
    113113         * We found the device that functions as an interrupt controller
    114          * for the interrupt. We also found mapping from interrupt to INO.
     114         * for the interrupt. We also found mapping from interrupt to INR.
    115115         */
    116116
    117117        controller = ofw_tree_find_node_by_handle(ofw_tree_lookup("/"), intr_map[i].controller_handle);
    118118       
    119         *ino = intr_map[i].controller_ino;
     119        *inr = intr_map[i].controller_inr;
    120120        return true;
    121121}

  • kernel/genarch/src/ofw/fhc.c

    r0b414b5 r233af8c5  
    110110}
    111111
    112 bool ofw_fhc_map_interrupts(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *ino)
     112bool ofw_fhc_map_interrupts(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *inr)
    113113{
    114114        fhc_t *fhc = NULL;
    … …  
    126126        fhc_enable_interrupt(fhc, interrupt);
    127127       
    128         *ino = interrupt;
     128        *inr = interrupt;
    129129        return true;
    130130}
Note: See TracChangeset for help on using the changeset viewer.