Changeset d1cbad5 in mainline for kernel/genarch/include


Ignore:
Timestamp:
2019-03-30T15:24:52Z (7 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a773b8b
Parents:
87a5796
Message:

Pass device addresses to i8259_init via arguments

Location:
kernel/genarch/include/genarch/drivers
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/genarch/include/genarch/drivers/i8259/i8259.h

    r87a5796 rd1cbad5  
    3939#include <arch/interrupt.h>
    4040
    41 #define PIC_PIC0PORT1  ((ioport8_t *) 0x20U)
    42 #define PIC_PIC0PORT2  ((ioport8_t *) 0x21U)
    43 #define PIC_PIC1PORT1  ((ioport8_t *) 0xa0U)
    44 #define PIC_PIC1PORT2  ((ioport8_t *) 0xa1U)
    45 
    4641/* ICW1 bits */
    4742#define PIC_ICW1           (1 << 4)
    … …  
    5247#define PIC_OCW4_NSEOI     (1 << 5)
    5348
    54 extern void i8259_init(void);
     49typedef struct {
     50        ioport8_t port1;
     51        ioport8_t port2;
     52} __attribute__((packed)) i8259_t;
     53
     54extern void i8259_init(i8259_t *, i8259_t *);
    5555extern void pic_enable_irqs(uint16_t);
    5656extern void pic_disable_irqs(uint16_t);

  • kernel/genarch/include/genarch/drivers/legacy/ia32/io.h

    r87a5796 rd1cbad5  
    4444#define NS16550_BASE  ((ioport8_t *) 0x3f8)
    4545
     46#define I8259_PIC0_BASE ((ioport8_t *) 0x20U)
     47#define I8259_PIC1_BASE ((ioport8_t *) 0xA0U)
     48
    4649#define EGA_VIDEORAM  0xb8000
    4750
Note: See TracChangeset for help on using the changeset viewer.