Changeset 87a5796 in mainline


Ignore:
Timestamp:
2019-03-30T14:47:26Z (5 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d1cbad5
Parents:
8f059b5
Message:

Move i8259 kernel driver to genarch

Files:
10 edited
2 moved

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r8f059b5 r87a5796  
    406406! [PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n)
    407407
     408% Support for Intel i8259 PIC
     409! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_I8259 (y)
     410
    408411% Virtually indexed D-cache support
    409412! [PLATFORM=sparc64] CONFIG_VIRT_IDX_DCACHE (y/n)

  • kernel/arch/amd64/Makefile.inc

    r8f059b5 r87a5796  
    6060        arch/$(KARCH)/src/ddi/ddi.c \
    6161        arch/$(KARCH)/src/drivers/i8254.c \
    62         arch/$(KARCH)/src/drivers/i8259.c \
    6362        arch/$(KARCH)/src/delay.S \
    6463        arch/$(KARCH)/src/amd64.c \

  • kernel/arch/amd64/src/amd64.c

    r8f059b5 r87a5796  
    4545#include <arch/boot/boot.h>
    4646#include <arch/drivers/i8254.h>
    47 #include <arch/drivers/i8259.h>
    4847#include <arch/syscall.h>
    4948#include <genarch/acpi/acpi.h>
    5049#include <genarch/drivers/ega/ega.h>
    5150#include <genarch/drivers/i8042/i8042.h>
     51#include <genarch/drivers/i8259/i8259.h>
    5252#include <genarch/drivers/ns16550/ns16550.h>
    5353#include <genarch/drivers/legacy/ia32/io.h>

  • kernel/arch/amd64/src/interrupt.c

    r8f059b5 r87a5796  
    3737#include <log.h>
    3838#include <panic.h>
    39 #include <arch/drivers/i8259.h>
     39#include <genarch/drivers/i8259/i8259.h>
    4040#include <halt.h>
    4141#include <cpu.h>

  • kernel/arch/ia32/Makefile.inc

    r8f059b5 r87a5796  
    9292        arch/$(KARCH)/src/ddi/ddi.c \
    9393        arch/$(KARCH)/src/drivers/i8254.c \
    94         arch/$(KARCH)/src/drivers/i8259.c \
    9594        arch/$(KARCH)/src/boot/multiboot.S \
    9695        arch/$(KARCH)/src/boot/multiboot2.S \

  • kernel/arch/ia32/src/drivers/i8254.c

    r8f059b5 r87a5796  
    4242#include <arch/cycle.h>
    4343#include <arch/interrupt.h>
    44 #include <arch/drivers/i8259.h>
     44#include <genarch/drivers/i8259/i8259.h>
    4545#include <arch/drivers/i8254.h>
    4646#include <cpu.h>

  • kernel/arch/ia32/src/ia32.c

    r8f059b5 r87a5796  
    4747#include <arch/boot/boot.h>
    4848#include <arch/drivers/i8254.h>
    49 #include <arch/drivers/i8259.h>
    5049#include <genarch/acpi/acpi.h>
    5150#include <genarch/drivers/ega/ega.h>
    5251#include <genarch/drivers/i8042/i8042.h>
     52#include <genarch/drivers/i8259/i8259.h>
    5353#include <genarch/drivers/ns16550/ns16550.h>
    5454#include <genarch/drivers/legacy/ia32/io.h>

  • kernel/arch/ia32/src/interrupt.c

    r8f059b5 r87a5796  
    3939#include <debug.h>
    4040#include <panic.h>
    41 #include <arch/drivers/i8259.h>
     41#include <genarch/drivers/i8259/i8259.h>
    4242#include <halt.h>
    4343#include <cpu.h>

  • kernel/arch/ia32/src/smp/smp.c

    r8f059b5 r87a5796  
    5555#include <log.h>
    5656#include <mem.h>
    57 #include <arch/drivers/i8259.h>
     57#include <genarch/drivers/i8259/i8259.h>
    5858#include <cpu.h>
    5959

  • kernel/genarch/Makefile.inc

    r8f059b5 r87a5796  
    8585endif
    8686
     87ifeq ($(CONFIG_I8259),y)
     88GENARCH_SOURCES += \
     89        genarch/src/drivers/i8259/i8259.c
     90endif
     91
    8792ifeq ($(CONFIG_NS16550),y)
    8893GENARCH_SOURCES += \

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

    r8f059b5 r87a5796  
    2727 */
    2828
    29 /** @addtogroup kernel_ia32
     29/** @addtogroup kernel_genarch
    3030 * @{
    3131 */
    … …  
    3333 */
    3434
    35 #ifndef KERN_ia32_I8259_H_
    36 #define KERN_ia32_I8259_H_
     35#ifndef KERN_I8259_H_
     36#define KERN_I8259_H_
    3737
    3838#include <typedefs.h>

  • kernel/genarch/src/drivers/i8259/i8259.c

    r8f059b5 r87a5796  
    2727 */
    2828
    29 /** @addtogroup kernel_ia32
     29/** @addtogroup kernel_genarch
    3030 * @{
    3131 */
    … …  
    3737 */
    3838
    39 #include <arch/drivers/i8259.h>
     39#include <genarch/drivers/i8259/i8259.h>
    4040#include <cpu.h>
    4141#include <stdint.h>
Note: See TracChangeset for help on using the changeset viewer.