From be73871f2ac83719f9c1cfc12992c755db6e7589 Mon Sep 17 00:00:00 2001 From: rlfnb Date: Wed, 3 Jun 2015 07:47:07 +0200 Subject: [PATCH 1/8] absence of a keyboard controller should not panic The kb_init() panics, if no pc kbd controller is found. Changed behavior to allow the driver returning smoother without a panic. --- minix/drivers/hid/pckbd/pckbd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/minix/drivers/hid/pckbd/pckbd.c b/minix/drivers/hid/pckbd/pckbd.c index b6a41f2b4..236cef088 100644 --- a/minix/drivers/hid/pckbd/pckbd.c +++ b/minix/drivers/hid/pckbd/pckbd.c @@ -250,7 +250,7 @@ kbc_read(void) /* * Initialize the keyboard hardware. */ -static void +static int kb_init(void) { int r, ccb; @@ -272,8 +272,10 @@ kb_init(void) /* Execute Controller Self Test. */ kbc_cmd0(0xAA); r = kbc_read(); - if (r != 0x55) - panic("PCKBD: Controller self-test failed.\n"); + if (r != 0x55){ + printf("PCKBD: Controller self-test failed.\n"); + return EGENERIC; + } /* Set interrupt handler and enable keyboard IRQ. */ irq_hook_id = KEYBOARD_IRQ; /* id to be returned on interrupt */ @@ -316,6 +318,7 @@ kb_init(void) kb_wait(); set_leds(0); + return OK; } /* @@ -466,7 +469,10 @@ pckbd_init(int UNUSED(type), sef_init_info_t *UNUSED(info)) init_timer(&tmr_kbd_wd); /* Initialize the keyboard. */ - kb_init(); + int r; + if((r = kb_init())!=OK){ + return r; + } /* Announce the driver's presence. */ if (aux_available != 0) From 55514b4a30b542ead583e9558240abb8a4304ae0 Mon Sep 17 00:00:00 2001 From: rlfnb Date: Tue, 8 Sep 2015 13:02:25 +0200 Subject: [PATCH 2/8] starting to make the minix_x86.img bootable --- releasetools/x86_hdimage.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/releasetools/x86_hdimage.sh b/releasetools/x86_hdimage.sh index c15e712b2..f421dca0d 100755 --- a/releasetools/x86_hdimage.sh +++ b/releasetools/x86_hdimage.sh @@ -190,7 +190,9 @@ _HOME_SIZE=$((`${CROSS_TOOLS}/nbmkfs.mfs -d ${HOMESIZEARG} -I $((${HOME_START}*5 # minix partition utility # ${CROSS_TOOLS}/nbpartition -m ${IMG} 0 81:${ISO_SIZE} \ - 81:${_ROOT_SIZE} 81:${_USR_SIZE} 81:${_HOME_SIZE} + 81:${_ROOT_SIZE}* 81:${_USR_SIZE} 81:${_HOME_SIZE} + ++dd if=${DESTDIR}/usr/mdec/mbr of=${IMG} conv=notrunc bs=446 count=1 mods="`( cd ${MODDIR}; echo mod* | tr ' ' ',' )`" if [ "x${ISOMODE}" = "x1" ] From a5696e751c5f0ec88a707125dd375a64b4f067de Mon Sep 17 00:00:00 2001 From: rlfnb Date: Thu, 4 Feb 2016 08:03:13 +0100 Subject: [PATCH 3/8] moved service configuration out of system.conf --- etc/system.conf | 29 ---------------------- minix/drivers/examples/hello/Makefile | 4 +++ minix/drivers/examples/hello/hello.conf | 13 ++++++++++ minix/drivers/sensors/bmp085/Makefile | 9 +++++-- minix/drivers/sensors/bmp085/bmp085.conf | 5 ++++ minix/drivers/sensors/sht21/Makefile | 9 +++++-- minix/drivers/sensors/sht21/sht21.conf | 5 ++++ minix/drivers/sensors/tsl2550/Makefile | 9 +++++-- minix/drivers/sensors/tsl2550/tsl2550.conf | 5 ++++ 9 files changed, 53 insertions(+), 35 deletions(-) create mode 100644 minix/drivers/examples/hello/hello.conf create mode 100644 minix/drivers/sensors/bmp085/bmp085.conf create mode 100644 minix/drivers/sensors/sht21/sht21.conf create mode 100644 minix/drivers/sensors/tsl2550/tsl2550.conf diff --git a/etc/system.conf b/etc/system.conf index e03d21393..3df3e0ea1 100644 --- a/etc/system.conf +++ b/etc/system.conf @@ -549,20 +549,6 @@ service pckbd priority 1; }; -service hello -{ - system - IRQCTL # 19 - DEVIO # 21 - ; - ipc - SYSTEM pm rs tty ds vm vfs - pci inet lwip amddev - ; - uid 0; -}; - - service devman { uid 0; @@ -669,21 +655,6 @@ service tps65950 ipc SYSTEM RS DS i2c readclock.drv; }; -service tsl2550 -{ - ipc SYSTEM RS DS i2c; -}; - -service sht21 -{ - ipc SYSTEM RS DS i2c; -}; - -service bmp085 -{ - ipc SYSTEM RS DS i2c; -}; - service vbox { system diff --git a/minix/drivers/examples/hello/Makefile b/minix/drivers/examples/hello/Makefile index e22a2a5d7..248c37b0c 100644 --- a/minix/drivers/examples/hello/Makefile +++ b/minix/drivers/examples/hello/Makefile @@ -2,6 +2,10 @@ PROG= hello SRCS= hello.c +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys diff --git a/minix/drivers/examples/hello/hello.conf b/minix/drivers/examples/hello/hello.conf new file mode 100644 index 000000000..23caec224 --- /dev/null +++ b/minix/drivers/examples/hello/hello.conf @@ -0,0 +1,13 @@ +service hello +{ + system + IRQCTL # 19 + DEVIO # 21 + ; + ipc + SYSTEM pm rs tty ds vm vfs + pci inet lwip amddev + ; + uid 0; +}; + diff --git a/minix/drivers/sensors/bmp085/Makefile b/minix/drivers/sensors/bmp085/Makefile index 1b2ceacc4..64ecdfaed 100644 --- a/minix/drivers/sensors/bmp085/Makefile +++ b/minix/drivers/sensors/bmp085/Makefile @@ -1,6 +1,11 @@ # Makefile for the bmp085 pressure and temp sensor found on the Weather Cape. -PROG= bmp085 -SRCS= bmp085.c + +PROG= bmp085 +SRCS= bmp085.c + +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lchardriver -lsys -ltimers diff --git a/minix/drivers/sensors/bmp085/bmp085.conf b/minix/drivers/sensors/bmp085/bmp085.conf new file mode 100644 index 000000000..5a4adb9be --- /dev/null +++ b/minix/drivers/sensors/bmp085/bmp085.conf @@ -0,0 +1,5 @@ +service bmp085 +{ + ipc SYSTEM RS DS i2c; +}; + diff --git a/minix/drivers/sensors/sht21/Makefile b/minix/drivers/sensors/sht21/Makefile index cbc417c45..8d7d90dc2 100644 --- a/minix/drivers/sensors/sht21/Makefile +++ b/minix/drivers/sensors/sht21/Makefile @@ -1,6 +1,11 @@ # Makefile for the sht21 humidity and temp sensor found on the Weather Cape. -PROG= sht21 -SRCS= sht21.c + +PROG= sht21 +SRCS= sht21.c + +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lchardriver -lsys -ltimers diff --git a/minix/drivers/sensors/sht21/sht21.conf b/minix/drivers/sensors/sht21/sht21.conf new file mode 100644 index 000000000..1978c1fb5 --- /dev/null +++ b/minix/drivers/sensors/sht21/sht21.conf @@ -0,0 +1,5 @@ +service sht21 +{ + ipc SYSTEM RS DS i2c; +}; + diff --git a/minix/drivers/sensors/tsl2550/Makefile b/minix/drivers/sensors/tsl2550/Makefile index 9dcec6387..57c8c4765 100644 --- a/minix/drivers/sensors/tsl2550/Makefile +++ b/minix/drivers/sensors/tsl2550/Makefile @@ -1,6 +1,11 @@ # Makefile for the tsl2550 ambient light sensor found on the Weather Cape. -PROG= tsl2550 -SRCS= tsl2550.c + +PROG= tsl2550 +SRCS= tsl2550.c + +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -li2cdriver -lchardriver -lsys -ltimers diff --git a/minix/drivers/sensors/tsl2550/tsl2550.conf b/minix/drivers/sensors/tsl2550/tsl2550.conf new file mode 100644 index 000000000..776e61c06 --- /dev/null +++ b/minix/drivers/sensors/tsl2550/tsl2550.conf @@ -0,0 +1,5 @@ +service tsl2550 +{ + ipc SYSTEM RS DS i2c; +}; + From 1c62412fc3b6ce9f0383d2177b006a51114e940a Mon Sep 17 00:00:00 2001 From: rlfnb Date: Sat, 6 Feb 2016 11:49:46 +0100 Subject: [PATCH 4/8] further refactoring Committer: rlfnb --- minix/drivers/system/gpio/gpio.conf | 28 ++++++++++++++++++++++++++ minix/drivers/vmm_guest/vbox/vbox.conf | 19 +++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 minix/drivers/system/gpio/gpio.conf create mode 100644 minix/drivers/vmm_guest/vbox/vbox.conf diff --git a/minix/drivers/system/gpio/gpio.conf b/minix/drivers/system/gpio/gpio.conf new file mode 100644 index 000000000..b1c2111d8 --- /dev/null +++ b/minix/drivers/system/gpio/gpio.conf @@ -0,0 +1,28 @@ +service gpio +{ + system + PRIVCTL # 4 + IRQCTL # 19 + PADCONF # 57 + ; + vm + SETCACHEPAGE + CLEARCACHE + ; + irq + 29 # GPIO module 1 (dm37xx) + 30 # GPIO module 2 (dm37xx) + 31 # GPIO module 3 (dm37xx) + 32 # GPIO module 4 (dm37xx) / module 2a (am335x) + 33 # GPIO module 5 (dm37xx) / module 2b (am335x) + 34 # GPIO module 6 (dm37xx) + 62 # GPIO module 3a (am335x) + 63 # GPIO module 3b (am335x) + 96 # GPIO module 0a (am335x) + 97 # GPIO module 0b (am335x) + 98 # GPIO module 1a (am335x) + 99 # GPIO module 1b (am335x) + ; + +}; + diff --git a/minix/drivers/vmm_guest/vbox/vbox.conf b/minix/drivers/vmm_guest/vbox/vbox.conf new file mode 100644 index 000000000..306812d19 --- /dev/null +++ b/minix/drivers/vmm_guest/vbox/vbox.conf @@ -0,0 +1,19 @@ +service vbox +{ + system + UMAP # 14 + VUMAP # 18 + IRQCTL # 19 + DEVIO # 21 + ; + pci device 80ee:cafe; + ipc + SYSTEM + PM + RS + VM + pci + ; + uid 0; +}; + From 6699862e6e70a395a77ec143c0ce957f1dda9113 Mon Sep 17 00:00:00 2001 From: rlfnb Date: Sat, 6 Feb 2016 11:49:46 +0100 Subject: [PATCH 5/8] further refactoring --- minix/drivers/audio/es1370/es1370.conf | 10 +++++++ minix/drivers/audio/es1371/es1371.conf | 10 +++++++ minix/drivers/bus/i2c/arch/i386/Makefile.inc | 7 +++++ minix/drivers/bus/i2c/i2c.earm.conf | 20 ++++++++++++++ minix/drivers/bus/ti1225/ti1225.conf | 8 ++++++ minix/drivers/iommu/amddev/amddev.conf | 14 ++++++++++ minix/drivers/net/dp8390/dp8390.conf | 14 ++++++++++ minix/drivers/net/dpeth/dpeth.conf | 10 +++++++ minix/drivers/printer/printer/printer.conf | 18 +++++++++++++ minix/drivers/system/gpio/gpio.conf | 28 ++++++++++++++++++++ minix/drivers/system/random/random.conf | 4 +++ minix/drivers/vmm_guest/vbox/vbox.conf | 19 +++++++++++++ minix/fs/vbfs/vbfs.conf | 11 ++++++++ minix/net/inet/inet.conf | 5 ++++ minix/net/lwip/lwip.conf | 5 ++++ 15 files changed, 183 insertions(+) create mode 100644 minix/drivers/audio/es1370/es1370.conf create mode 100644 minix/drivers/audio/es1371/es1371.conf create mode 100644 minix/drivers/bus/i2c/arch/i386/Makefile.inc create mode 100644 minix/drivers/bus/i2c/i2c.earm.conf create mode 100644 minix/drivers/bus/ti1225/ti1225.conf create mode 100644 minix/drivers/iommu/amddev/amddev.conf create mode 100644 minix/drivers/net/dp8390/dp8390.conf create mode 100644 minix/drivers/net/dpeth/dpeth.conf create mode 100644 minix/drivers/printer/printer/printer.conf create mode 100644 minix/drivers/system/gpio/gpio.conf create mode 100644 minix/drivers/system/random/random.conf create mode 100644 minix/drivers/vmm_guest/vbox/vbox.conf create mode 100644 minix/fs/vbfs/vbfs.conf create mode 100644 minix/net/inet/inet.conf create mode 100644 minix/net/lwip/lwip.conf diff --git a/minix/drivers/audio/es1370/es1370.conf b/minix/drivers/audio/es1370/es1370.conf new file mode 100644 index 000000000..6f966cc2d --- /dev/null +++ b/minix/drivers/audio/es1370/es1370.conf @@ -0,0 +1,10 @@ +service es1370 +{ + system + UMAP # 14 + IRQCTL # 19 + DEVIO # 21 + ; + pci device 1274:5000; +}; + diff --git a/minix/drivers/audio/es1371/es1371.conf b/minix/drivers/audio/es1371/es1371.conf new file mode 100644 index 000000000..0ef21af34 --- /dev/null +++ b/minix/drivers/audio/es1371/es1371.conf @@ -0,0 +1,10 @@ +ervice es1371 +{ + system + UMAP # 14 + IRQCTL # 19 + DEVIO # 21 + ; + pci device 1274:1371; +}; + diff --git a/minix/drivers/bus/i2c/arch/i386/Makefile.inc b/minix/drivers/bus/i2c/arch/i386/Makefile.inc new file mode 100644 index 000000000..9138888db --- /dev/null +++ b/minix/drivers/bus/i2c/arch/i386/Makefile.inc @@ -0,0 +1,7 @@ +# Makefile for arch-dependent i2c code +.include + +HERE=${.CURDIR}/arch/${MACHINE_ARCH} +.PATH: ${HERE} + +SRCS += pci_i2c.c pci_i2c.h pci_i2c_register.h diff --git a/minix/drivers/bus/i2c/i2c.earm.conf b/minix/drivers/bus/i2c/i2c.earm.conf new file mode 100644 index 000000000..6112f91c7 --- /dev/null +++ b/minix/drivers/bus/i2c/i2c.earm.conf @@ -0,0 +1,20 @@ +service i2c +{ + system + PRIVCTL # 4 + IRQCTL # 19 + PADCONF # 57 + ; + irq + # DM37XX (BeagleBoard-xM) + 56 # I2C module 1 + 57 # I2C module 2 + 61 # I2C module 3 + # AM335X (BeagleBone) + 70 # I2C module 1 + 71 # I2C module 2 + 30 # I2C module 3 + ; + ipc SYSTEM RS DS; +}; + diff --git a/minix/drivers/bus/ti1225/ti1225.conf b/minix/drivers/bus/ti1225/ti1225.conf new file mode 100644 index 000000000..8cb6f2de8 --- /dev/null +++ b/minix/drivers/bus/ti1225/ti1225.conf @@ -0,0 +1,8 @@ +service ti1225 +{ + system + IRQCTL # 19 + ; + pci device 104c:ac1c; +}; + diff --git a/minix/drivers/iommu/amddev/amddev.conf b/minix/drivers/iommu/amddev/amddev.conf new file mode 100644 index 000000000..8a8fed8ee --- /dev/null +++ b/minix/drivers/iommu/amddev/amddev.conf @@ -0,0 +1,14 @@ +service amddev +{ + pci device 1022:1103; + system + UMAP_REMOTE # 17 + ; + vm + ADDDMA # 12 + DELDMA # 13 + GETDMA # 14 + ; + uid 0; +}; + diff --git a/minix/drivers/net/dp8390/dp8390.conf b/minix/drivers/net/dp8390/dp8390.conf new file mode 100644 index 000000000..def6dbcf5 --- /dev/null +++ b/minix/drivers/net/dp8390/dp8390.conf @@ -0,0 +1,14 @@ +service dp8390 +{ + system + IRQCTL # 19 + DEVIO # 21 + SDEVIO # 22 + ; + pci device 10ec:8029; + io + 300:20 + ; + irq 9; +}; + diff --git a/minix/drivers/net/dpeth/dpeth.conf b/minix/drivers/net/dpeth/dpeth.conf new file mode 100644 index 000000000..8523032d0 --- /dev/null +++ b/minix/drivers/net/dpeth/dpeth.conf @@ -0,0 +1,10 @@ +service dpeth +{ + system + IRQCTL # 19 + DEVIO # 21 + SDEVIO # 22 + ; + uid 0; +}; + diff --git a/minix/drivers/printer/printer/printer.conf b/minix/drivers/printer/printer/printer.conf new file mode 100644 index 000000000..0e8c25539 --- /dev/null +++ b/minix/drivers/printer/printer/printer.conf @@ -0,0 +1,18 @@ +service printer +{ + io 378:4 # LPT1 + 278:4 # LPT2 + ; + irq + 7 # PRINTER_IRQ + ; + system + KILL # 6 + UMAP # 14 + IRQCTL # 19 + DEVIO # 21 + VDEVIO # 23 + READBIOS # 35 + ; +}; + diff --git a/minix/drivers/system/gpio/gpio.conf b/minix/drivers/system/gpio/gpio.conf new file mode 100644 index 000000000..b1c2111d8 --- /dev/null +++ b/minix/drivers/system/gpio/gpio.conf @@ -0,0 +1,28 @@ +service gpio +{ + system + PRIVCTL # 4 + IRQCTL # 19 + PADCONF # 57 + ; + vm + SETCACHEPAGE + CLEARCACHE + ; + irq + 29 # GPIO module 1 (dm37xx) + 30 # GPIO module 2 (dm37xx) + 31 # GPIO module 3 (dm37xx) + 32 # GPIO module 4 (dm37xx) / module 2a (am335x) + 33 # GPIO module 5 (dm37xx) / module 2b (am335x) + 34 # GPIO module 6 (dm37xx) + 62 # GPIO module 3a (am335x) + 63 # GPIO module 3b (am335x) + 96 # GPIO module 0a (am335x) + 97 # GPIO module 0b (am335x) + 98 # GPIO module 1a (am335x) + 99 # GPIO module 1b (am335x) + ; + +}; + diff --git a/minix/drivers/system/random/random.conf b/minix/drivers/system/random/random.conf new file mode 100644 index 000000000..74ed01025 --- /dev/null +++ b/minix/drivers/system/random/random.conf @@ -0,0 +1,4 @@ +service random +{ +}; + diff --git a/minix/drivers/vmm_guest/vbox/vbox.conf b/minix/drivers/vmm_guest/vbox/vbox.conf new file mode 100644 index 000000000..306812d19 --- /dev/null +++ b/minix/drivers/vmm_guest/vbox/vbox.conf @@ -0,0 +1,19 @@ +service vbox +{ + system + UMAP # 14 + VUMAP # 18 + IRQCTL # 19 + DEVIO # 21 + ; + pci device 80ee:cafe; + ipc + SYSTEM + PM + RS + VM + pci + ; + uid 0; +}; + diff --git a/minix/fs/vbfs/vbfs.conf b/minix/fs/vbfs/vbfs.conf new file mode 100644 index 000000000..1aede331b --- /dev/null +++ b/minix/fs/vbfs/vbfs.conf @@ -0,0 +1,11 @@ +service vbfs +{ + ipc + SYSTEM pm vfs rs ds vm vbox + ; + vm + SETCACHEPAGE + CLEARCACHE + ; +}; + diff --git a/minix/net/inet/inet.conf b/minix/net/inet/inet.conf new file mode 100644 index 000000000..657b23b46 --- /dev/null +++ b/minix/net/inet/inet.conf @@ -0,0 +1,5 @@ +service inet +{ + uid 0; +}; + diff --git a/minix/net/lwip/lwip.conf b/minix/net/lwip/lwip.conf new file mode 100644 index 000000000..657b23b46 --- /dev/null +++ b/minix/net/lwip/lwip.conf @@ -0,0 +1,5 @@ +service inet +{ + uid 0; +}; + From cce755a577af3f1ea66e5d91c9a221345ced9506 Mon Sep 17 00:00:00 2001 From: rlfnb Date: Sat, 6 Feb 2016 14:32:44 +0100 Subject: [PATCH 6/8] further refactoring (system.conf) --- distrib/sets/lists/minix-base/md.evbarm | 5 + distrib/sets/lists/minix-base/md.i386 | 13 ++ etc/system.conf | 200 +----------------------- minix/drivers/audio/es1370/Makefile | 4 + minix/drivers/audio/es1371/Makefile | 4 + minix/drivers/bus/ti1225/Makefile | 4 + minix/drivers/examples/hello/Makefile | 4 +- minix/drivers/iommu/amddev/Makefile | 4 + minix/drivers/net/dp8390/Makefile | 4 + minix/drivers/net/dpeth/Makefile | 4 + minix/drivers/printer/printer/Makefile | 4 + minix/drivers/sensors/bmp085/Makefile | 4 +- minix/drivers/sensors/sht21/Makefile | 4 +- minix/drivers/sensors/tsl2550/Makefile | 4 +- minix/drivers/system/gpio/Makefile | 4 + minix/drivers/system/random/Makefile | 4 + minix/drivers/vmm_guest/vbox/Makefile | 4 + minix/fs/vbfs/Makefile | 4 + minix/net/inet/Makefile | 4 + minix/net/lwip/Makefile | 4 + 20 files changed, 83 insertions(+), 203 deletions(-) diff --git a/distrib/sets/lists/minix-base/md.evbarm b/distrib/sets/lists/minix-base/md.evbarm index d116e1b0a..ddb43e324 100644 --- a/distrib/sets/lists/minix-base/md.evbarm +++ b/distrib/sets/lists/minix-base/md.evbarm @@ -7,7 +7,12 @@ # ./etc/rc.capes minix-base ./etc/rc.capes/BB-BONE-WTHR-01 minix-base +./etc/system.conf.d/bmp085 minix-base +./etc/system.conf.d/gpio minix-base +./etc/system.conf.d/i2c minix-base ./etc/system.conf.d/lan8710a minix-base +./etc/system.conf.d/sht21 minix-base +./etc/system.conf.d/tsl2550 minix-base ./etc/system.conf.d/usbd minix-base ./service/bmp085 minix-base ./service/cat24c256 minix-base diff --git a/distrib/sets/lists/minix-base/md.i386 b/distrib/sets/lists/minix-base/md.i386 index 2b1998e07..b7502b904 100644 --- a/distrib/sets/lists/minix-base/md.i386 +++ b/distrib/sets/lists/minix-base/md.i386 @@ -6,13 +6,26 @@ # mv out mi # ./etc/system.conf.d/3c90x minix-base +./etc/system.conf.d/amddev minix-base ./etc/system.conf.d/atl2 minix-base ./etc/system.conf.d/dec21140A minix-base +./etc/system.conf.d/dp8390 minix-base +./etc/system.conf.d/dpeth minix-base +./etc/system.conf.d/es1370 minix-base +./etc/system.conf.d/es1371 minix-base ./etc/system.conf.d/e1000 minix-base ./etc/system.conf.d/fxp minix-base +./etc/system.conf.d/hello minix-base +./etc/system.conf.d/inet minix-base ./etc/system.conf.d/lance minix-base +./etc/system.conf.d/lwip minix-base +./etc/system.conf.d/printer minix-base +./etc/system.conf.d/random minix-base ./etc/system.conf.d/rtl8139 minix-base ./etc/system.conf.d/rtl8169 minix-base +./etc/system.conf.d/ti1225 minix-base +./etc/system.conf.d/vbfs minix-base +./etc/system.conf.d/vbox minix-base ./etc/system.conf.d/virtio_net minix-base ./service/3c90x minix-base ./service/acpi minix-base diff --git a/etc/system.conf b/etc/system.conf index 3df3e0ea1..5996ebce8 100644 --- a/etc/system.conf +++ b/etc/system.conf @@ -256,44 +256,6 @@ service floppy ; }; -service dp8390 -{ - system - IRQCTL # 19 - DEVIO # 21 - SDEVIO # 22 - ; - pci device 10ec:8029; - io - 300:20 - ; - irq 9; -}; - -service dpeth -{ - system - IRQCTL # 19 - DEVIO # 21 - SDEVIO # 22 - ; - uid 0; -}; - -service inet -{ - uid 0; -}; - -service lwip -{ - uid 0; -}; - -service random -{ -}; - service readclock.drv { ipc ALL; @@ -335,6 +297,11 @@ service pci PRIVCTL # 4 DEVIO # 21 ; + ipc + acpi + ipc + acpi + ; uid 0; }; @@ -426,96 +393,6 @@ service hgfs ; }; -service vbfs -{ - ipc - SYSTEM pm vfs rs ds vm vbox - ; - vm - SETCACHEPAGE - CLEARCACHE - ; -}; - -service printer -{ - io 378:4 # LPT1 - 278:4 # LPT2 - ; - irq - 7 # PRINTER_IRQ - ; - system - KILL # 6 - UMAP # 14 - IRQCTL # 19 - DEVIO # 21 - VDEVIO # 23 - READBIOS # 35 - ; -}; - -service es1370 -{ - system - UMAP # 14 - IRQCTL # 19 - DEVIO # 21 - ; - pci device 1274:5000; -}; - -service es1371 -{ - system - UMAP # 14 - IRQCTL # 19 - DEVIO # 21 - ; - pci device 1274:1371; -}; - -service ti1225 -{ - system - IRQCTL # 19 - ; - pci device 104c:ac1c; -}; - -service amddev -{ - pci device 1022:1103; - system - UMAP_REMOTE # 17 - ; - vm - ADDDMA # 12 - DELDMA # 13 - GETDMA # 14 - ; - uid 0; -}; - -service osscore -{ - system - PRIVCTL # 4 - UMAP # 14 - IRQCTL # 19 - DEVIO # 21 - SDEVIO # 22 - ; - pci class - 4/1 # Multimedia / Audio device - ; - ipc - SYSTEM pm rs tty ds vfs vm - pci inet lwip amddev - ; - uid 0; -}; - service filter { ipc @@ -584,54 +461,6 @@ service fb ; }; -service gpio -{ - system - PRIVCTL # 4 - IRQCTL # 19 - PADCONF # 57 - ; - vm - SETCACHEPAGE - CLEARCACHE - ; - irq - 29 # GPIO module 1 (dm37xx) - 30 # GPIO module 2 (dm37xx) - 31 # GPIO module 3 (dm37xx) - 32 # GPIO module 4 (dm37xx) / module 2a (am335x) - 33 # GPIO module 5 (dm37xx) / module 2b (am335x) - 34 # GPIO module 6 (dm37xx) - 62 # GPIO module 3a (am335x) - 63 # GPIO module 3b (am335x) - 96 # GPIO module 0a (am335x) - 97 # GPIO module 0b (am335x) - 98 # GPIO module 1a (am335x) - 99 # GPIO module 1b (am335x) - ; - -}; - -service i2c -{ - system - PRIVCTL # 4 - IRQCTL # 19 - PADCONF # 57 - ; - irq - # DM37XX (BeagleBoard-xM) - 56 # I2C module 1 - 57 # I2C module 2 - 61 # I2C module 3 - # AM335X (BeagleBone) - 70 # I2C module 1 - 71 # I2C module 2 - 30 # I2C module 3 - ; - ipc SYSTEM RS DS; -}; - service cat24c256 { ipc SYSTEM RS DS i2c; @@ -655,25 +484,6 @@ service tps65950 ipc SYSTEM RS DS i2c readclock.drv; }; -service vbox -{ - system - UMAP # 14 - VUMAP # 18 - IRQCTL # 19 - DEVIO # 21 - ; - pci device 80ee:cafe; - ipc - SYSTEM - PM - RS - VM - pci - ; - uid 0; -}; - service fbd { ipc diff --git a/minix/drivers/audio/es1370/Makefile b/minix/drivers/audio/es1370/Makefile index 86e89f645..dc14d59ae 100644 --- a/minix/drivers/audio/es1370/Makefile +++ b/minix/drivers/audio/es1370/Makefile @@ -2,6 +2,10 @@ PROG= es1370 SRCS= es1370.c ak4531.c pci_helper.c +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -laudiodriver -lchardriver -lsys diff --git a/minix/drivers/audio/es1371/Makefile b/minix/drivers/audio/es1371/Makefile index f7608ad75..a9a27d5b0 100644 --- a/minix/drivers/audio/es1371/Makefile +++ b/minix/drivers/audio/es1371/Makefile @@ -2,6 +2,10 @@ PROG= es1371 SRCS= es1371.c AC97.c pci_helper.c wait.c sample_rate_converter.c +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -laudiodriver -lchardriver -lsys diff --git a/minix/drivers/bus/ti1225/Makefile b/minix/drivers/bus/ti1225/Makefile index e1c1a11d0..b00c36a9e 100644 --- a/minix/drivers/bus/ti1225/Makefile +++ b/minix/drivers/bus/ti1225/Makefile @@ -2,6 +2,10 @@ PROG= ti1225 SRCS= ti1225.c +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBSYS} LDADD+= -lsys diff --git a/minix/drivers/examples/hello/Makefile b/minix/drivers/examples/hello/Makefile index 248c37b0c..4badb39fd 100644 --- a/minix/drivers/examples/hello/Makefile +++ b/minix/drivers/examples/hello/Makefile @@ -2,8 +2,8 @@ PROG= hello SRCS= hello.c -FILES=$(PROG).conf -FILESNAME=$(PROG) +FILES=${PROG}.conf +FILESNAME=${PROG} FILESDIR= /etc/system.conf.d DPADD+= ${LIBCHARDRIVER} ${LIBSYS} diff --git a/minix/drivers/iommu/amddev/Makefile b/minix/drivers/iommu/amddev/Makefile index f40e80e22..5e4dcd4ad 100644 --- a/minix/drivers/iommu/amddev/Makefile +++ b/minix/drivers/iommu/amddev/Makefile @@ -2,6 +2,10 @@ PROG= amddev SRCS= amddev.c +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBSYS} LDADD+= -lsys diff --git a/minix/drivers/net/dp8390/Makefile b/minix/drivers/net/dp8390/Makefile index d48227ef7..bd3b36632 100644 --- a/minix/drivers/net/dp8390/Makefile +++ b/minix/drivers/net/dp8390/Makefile @@ -2,6 +2,10 @@ PROG= dp8390 SRCS= 3c503.c dp8390.c ne2000.c rtl8029.c wdeth.c +FILES=${PROG}.conf +FILESNAME=${PROG} +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBNETDRIVER} ${LIBSYS} LDADD+= -lnetdriver -lsys diff --git a/minix/drivers/net/dpeth/Makefile b/minix/drivers/net/dpeth/Makefile index 8bf0cdff6..346c8d688 100644 --- a/minix/drivers/net/dpeth/Makefile +++ b/minix/drivers/net/dpeth/Makefile @@ -2,6 +2,10 @@ PROG= dpeth SRCS= 3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBNETDRIVER} ${LIBSYS} LDADD+= -lnetdriver -lsys diff --git a/minix/drivers/printer/printer/Makefile b/minix/drivers/printer/printer/Makefile index e1b045b3c..3acf95da5 100644 --- a/minix/drivers/printer/printer/Makefile +++ b/minix/drivers/printer/printer/Makefile @@ -2,6 +2,10 @@ PROG= printer SRCS= printer.c liveupdate.c +FILES=${PROG}.conf +FILESNAME=${PROG} +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys diff --git a/minix/drivers/sensors/bmp085/Makefile b/minix/drivers/sensors/bmp085/Makefile index 64ecdfaed..8f3f9cd4b 100644 --- a/minix/drivers/sensors/bmp085/Makefile +++ b/minix/drivers/sensors/bmp085/Makefile @@ -3,8 +3,8 @@ PROG= bmp085 SRCS= bmp085.c -FILES=$(PROG).conf -FILESNAME=$(PROG) +FILES=${PROG}.conf +FILESNAME=${PROG} FILESDIR= /etc/system.conf.d DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} diff --git a/minix/drivers/sensors/sht21/Makefile b/minix/drivers/sensors/sht21/Makefile index 8d7d90dc2..c1676b31c 100644 --- a/minix/drivers/sensors/sht21/Makefile +++ b/minix/drivers/sensors/sht21/Makefile @@ -3,8 +3,8 @@ PROG= sht21 SRCS= sht21.c -FILES=$(PROG).conf -FILESNAME=$(PROG) +FILES=${PROG}.conf +FILESNAME=${PROG} FILESDIR= /etc/system.conf.d DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} diff --git a/minix/drivers/sensors/tsl2550/Makefile b/minix/drivers/sensors/tsl2550/Makefile index 57c8c4765..6afbbecd5 100644 --- a/minix/drivers/sensors/tsl2550/Makefile +++ b/minix/drivers/sensors/tsl2550/Makefile @@ -3,8 +3,8 @@ PROG= tsl2550 SRCS= tsl2550.c -FILES=$(PROG).conf -FILESNAME=$(PROG) +FILES=${PROG}.conf +FILESNAME=${PROG} FILESDIR= /etc/system.conf.d DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} diff --git a/minix/drivers/system/gpio/Makefile b/minix/drivers/system/gpio/Makefile index ef195ea06..2d731735f 100644 --- a/minix/drivers/system/gpio/Makefile +++ b/minix/drivers/system/gpio/Makefile @@ -2,6 +2,10 @@ PROG= gpio SRCS= gpio.c +FILES=${PROG}.conf +FILESNAME=${PROG} +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBVTREEFS} ${LIBFSDRIVER} ${LIBSYS} ${LIBGPIO} ${LIBCLKCONF} LDADD+= -lvtreefs -lfsdriver -lsys -lgpio -lclkconf diff --git a/minix/drivers/system/random/Makefile b/minix/drivers/system/random/Makefile index ac1fb733a..1842fb1d9 100644 --- a/minix/drivers/system/random/Makefile +++ b/minix/drivers/system/random/Makefile @@ -2,6 +2,10 @@ PROG= random SRCS= main.c random.c rijndael_api.c rijndael_alg.c +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + .PATH: ${.CURDIR}/aes DPADD+= ${LIBCHARDRIVER} ${LIBSYS} diff --git a/minix/drivers/vmm_guest/vbox/Makefile b/minix/drivers/vmm_guest/vbox/Makefile index a8aab8b31..20adaf0f7 100644 --- a/minix/drivers/vmm_guest/vbox/Makefile +++ b/minix/drivers/vmm_guest/vbox/Makefile @@ -2,6 +2,10 @@ PROG= vbox SRCS= vbox.c hgcm.c err.c +FILES=${PROG}.conf +FILESNAME=${PROG} +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBSYS} LDADD+= -lsys diff --git a/minix/fs/vbfs/Makefile b/minix/fs/vbfs/Makefile index b1b2b4626..1051f066a 100644 --- a/minix/fs/vbfs/Makefile +++ b/minix/fs/vbfs/Makefile @@ -3,6 +3,10 @@ PROG= vbfs SRCS= vbfs.c MAN= vbfs.8 +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + DPADD+= ${LIBSFFS} ${LIBVBOXFS} ${LIBFSDRIVER} ${LIBSYS} LDADD+= -lsffs -lvboxfs -lfsdriver -lsys diff --git a/minix/net/inet/Makefile b/minix/net/inet/Makefile index b2ab09005..a3b4fce20 100644 --- a/minix/net/inet/Makefile +++ b/minix/net/inet/Makefile @@ -11,6 +11,10 @@ SRCS= buf.c clock.c inet.c inet_config.c \ queryparam.c version.c MAN= inet.8 +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + .PATH: ${.CURDIR}/generic DPADD+= ${LIBCHARDRIVER} ${LIBSYS} diff --git a/minix/net/lwip/Makefile b/minix/net/lwip/Makefile index 2eb0102e5..b325b9bfe 100644 --- a/minix/net/lwip/Makefile +++ b/minix/net/lwip/Makefile @@ -10,6 +10,10 @@ SRCS= lwip.c \ inet_config.c \ eth.c +FILES=$(PROG).conf +FILESNAME=$(PROG) +FILESDIR= /etc/system.conf.d + .PATH: ${.CURDIR}/generic DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBLWIP} ${LIBNETSOCK} From cd9691aaf25aebfb0245e28c48f62b1e37c09db8 Mon Sep 17 00:00:00 2001 From: Ralf Neeb Date: Sat, 6 Feb 2016 19:28:14 +0100 Subject: [PATCH 7/8] ifixed previous insert by accident, which prevents system from booting --- etc/system.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/etc/system.conf b/etc/system.conf index 5996ebce8..a2d6bc006 100644 --- a/etc/system.conf +++ b/etc/system.conf @@ -297,11 +297,6 @@ service pci PRIVCTL # 4 DEVIO # 21 ; - ipc - acpi - ipc - acpi - ; uid 0; }; From 55f893a996a20bafb94459a7f287bf528079204e Mon Sep 17 00:00:00 2001 From: rlfnb Date: Sat, 6 Feb 2016 21:08:50 +0100 Subject: [PATCH 8/8] iifdef for switching RTS/CTS off --- minix/drivers/tty/tty/arch/i386/rs232.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/minix/drivers/tty/tty/arch/i386/rs232.c b/minix/drivers/tty/tty/arch/i386/rs232.c index d65107740..2bcbee5d5 100644 --- a/minix/drivers/tty/tty/arch/i386/rs232.c +++ b/minix/drivers/tty/tty/arch/i386/rs232.c @@ -11,6 +11,9 @@ #if NR_RS_LINES > 0 +/* switch RTS/CTS on/off */ +// #define UART_RTSCTS_OFF + /* 8250 constants. */ #define UART_FREQ 115200L /* timer frequency */ @@ -86,6 +89,18 @@ * dropped by close of the device). * OUT2 is also kept high all the time. */ +#ifdef UART_RTSCTS_OFF +#define istart(rs) \ + (rs)->idevready = TRUE + +#define istop(rs) \ + (rs)->idevready = FALSE + +/* Macro to tell if device is ready. The rs->cts field is set to MS_CTS if + * CLOCAL is in effect for a line without a CTS wire. + */ +#define devready(rs) MS_CTS +#else #define istart(rs) \ (sys_outb((rs)->modem_ctl_port, MC_OUT2 | MC_RTS | MC_DTR), \ (rs)->idevready = TRUE) @@ -98,6 +113,8 @@ */ #define devready(rs) ((my_inb(rs->modem_status_port) | rs->cts) & MS_CTS) +#endif + /* Macro to tell if transmitter is ready. */ #define txready(rs) (my_inb(rs->line_status_port) & LS_TRANSMITTER_READY) @@ -507,9 +524,12 @@ void rs_init(tty_t *tp) } rs_irq_set |= (1 << irq); - +#ifdef UART_RTSCTS_OFF + sys_outb(rs->int_enab_port, IE_LINE_STATUS_CHANGE | IE_RECEIVER_READY | IE_TRANSMITTER_READY); +#else sys_outb(rs->int_enab_port, IE_LINE_STATUS_CHANGE | IE_MODEM_STATUS_CHANGE | IE_RECEIVER_READY | IE_TRANSMITTER_READY); +#endif /* Fill in TTY function hooks. */ tp->tty_devread = rs_read;