Changeset 535 for soft

Timestamp:

Mar 27, 2015, 12:27:47 PM (10 years ago)

Author:

alain

Message:

Bloup...

Location:

soft/giet_vm

Files:

• Makefile (modified) (4 diffs)
• giet_config.h (modified) (1 diff)

soft/giet_vm/Makefile

@@ -27 +27 @@
 
 ### Objects to be linked for the drivers library
-DRIVERS_OBJS = build/drivers/dma_driver.o \
-               build/drivers/cma_driver.o \
-               build/drivers/xcu_driver.o \
-               build/drivers/ioc_driver.o \
-               build/drivers/bdv_driver.o \
-               build/drivers/hba_driver.o \
-               build/drivers/sdc_driver.o \
-               build/drivers/spi_driver.o \
-               build/drivers/rdk_driver.o \
-               build/drivers/iob_driver.o \
-               build/drivers/mmc_driver.o \
-               build/drivers/mwr_driver.o \
-               build/drivers/nic_driver.o \
-               build/drivers/tim_driver.o \
-               build/drivers/tty_driver.o \
+DRIVERS_OBJS = build/drivers/dma_driver.o      \
+               build/drivers/cma_driver.o      \
+               build/drivers/xcu_driver.o      \
+               build/drivers/bdv_driver.o      \
+               build/drivers/hba_driver.o      \
+               build/drivers/sdc_driver.o      \
+               build/drivers/spi_driver.o      \
+               build/drivers/rdk_driver.o      \
+               build/drivers/iob_driver.o      \
+               build/drivers/mmc_driver.o      \
+               build/drivers/mwr_driver.o      \
+               build/drivers/nic_driver.o      \
+               build/drivers/tim_driver.o      \
+               build/drivers/tty_driver.o      \
                build/drivers/pic_driver.o
 
@@ -70 +69 @@
                build/fat32/fat32.o             \
                build/kernel/ctx_handler.o      \
+               build/kernel/irq_handler.o      \
                build/kernel/switch.o           \
                build/boot/boot.o               \
@@ -253 +253 @@
         $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
 
-build/drivers/ioc_driver.o: giet_drivers/ioc_driver.c  \
-                            giet_drivers/ioc_driver.h  \
-                            hard_config.h              \
-                            giet_config.h
-        $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
-
 build/drivers/bdv_driver.o: giet_drivers/bdv_driver.c  \
                             giet_drivers/bdv_driver.h  \
@@ -398 +392 @@
                    giet_fat32/fat32.h        \
                    giet_common/vmem.h        \
-                   giet_drivers/tty_driver.h \
-                   giet_drivers/ioc_driver.h \
                    hard_config.h             \
                    giet_config.h

soft/giet_vm/giet_config.h

@@ -57 +57 @@
 #define GIET_NIC_MAC4            0x12345678 /* 32 LSB bits of the MAC address */
 #define GIET_NIC_MAC2            0xBEBE     /* 16 MSB bits of the MAC address */
+#define GIET_ISR_TYPE_MAX        32         /* max number of ISR types */
+#define GIET_ISR_CHANNEL_MAX     8          /* max number of ISR channels */
 
 #endif