tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reflected feedback

Browse Source
This commit is contained in:
rlfnb 2016-10-25 10:16:24 +02:00
parent 17b74bc6c5
commit bec57b0a7d
4 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/sets/lists/minix-base/md.i386
View File

@ -62,7 +62,7 @@
./usr/lib/libm387.so.0 minix-base ./usr/lib/libm387.so.0 minix-base
./usr/lib/libm387.so.0.1 minix-base ./usr/lib/libm387.so.0.1 minix-base
./usr/lib/libm387_pic.a minix-base ./usr/lib/libm387_pic.a minix-base
./usr/lib/libacpi.a minix-base ./usr/lib/libacpi.a minix-base
./usr/lib/libacpi_pic.a minix-base ./usr/lib/libacpi_pic.a minix-base
./usr/lib/libvassert.a minix-base ./usr/lib/libvassert.a minix-base
./usr/lib/libvboxfs.a minix-base ./usr/lib/libvboxfs.a minix-base

6
lib/Makefile
View File

@ -22,8 +22,7 @@ SUBDIR+= libc
SUBDIR+= .WAIT SUBDIR+= .WAIT
.if defined(__MINIX) .if defined(__MINIX)
SUBDIR+= ../minix/lib/libacpi \ SUBDIR+= ../minix/lib/libasyn \
../minix/lib/libasyn \
../minix/lib/libaudiodriver \ ../minix/lib/libaudiodriver \
../minix/lib/libbdev \ ../minix/lib/libbdev \
../minix/lib/libblockdriver \ ../minix/lib/libblockdriver \
@ -51,7 +50,8 @@ SUBDIR+= ../minix/lib/liblwip \
.endif .endif
.if (${MACHINE_ARCH} == "i386") .if (${MACHINE_ARCH} == "i386")
SUBDIR+= ../minix/lib/libhgfs \ SUBDIR+= ../minix/lib/libacpi \
../minix/lib/libhgfs \
../minix/lib/libvassert \ ../minix/lib/libvassert \
../minix/lib/libvboxfs \ ../minix/lib/libvboxfs \
../minix/lib/libvirtio ../minix/lib/libvirtio

30
minix/lib/libacpi/acpi.c
View File

@ -10,28 +10,19 @@
#include <minix/log.h> #include <minix/log.h>
#include <minix/sysutil.h> #include <minix/sysutil.h>
#include "acpi.h"
static struct log log = static struct log log =
{ .name = "libacpi", .log_level = LEVEL_TRACE, .log_func = default_log }; { .name = "libacpi", .log_level = LEVEL_TRACE, .log_func = default_log };
static endpoint_t acpi_ep = NONE; static endpoint_t acpi_ep = NONE;
int int
do_init() acpi_init(void)
{ {
int res; int res;
res = ds_retrieve_label_endpt("acpi", &acpi_ep); res = ds_retrieve_label_endpt("acpi", &acpi_ep);
log_info(&log, "resolved acpi to endpoint: %d\n", acpi_ep);
return res; return res;
} }
int
acpi_init()
{
return do_init();
}
/*===========================================================================* /*===========================================================================*
* IRQ handling * * IRQ handling *
*===========================================================================*/ *===========================================================================*/
@ -41,13 +32,14 @@ acpi_get_irq(unsigned bus, unsigned dev, unsigned pin)
int err; int err;
message m; message m;
if(acpi_ep == NONE) if (acpi_ep == NONE) {
{ err = acpi_init();
err = do_init(); if (OK != err) {
if (OK != err)
{
panic("libacpi: ds_retrieve_label_endpt failed for 'acpi': %d", err); panic("libacpi: ds_retrieve_label_endpt failed for 'acpi': %d", err);
} }
else {
log_info(&log, "resolved acpi to endpoint: %d\n", acpi_ep);
}
} }
((struct acpi_get_irq_req *)&m)->hdr.request = ACPI_REQ_GET_IRQ; ((struct acpi_get_irq_req *)&m)->hdr.request = ACPI_REQ_GET_IRQ;
@ -72,11 +64,9 @@ acpi_map_bridge(unsigned int pbnr, unsigned int dev, unsigned int sbnr)
int err; int err;
message m; message m;
if(acpi_ep == NONE) if(acpi_ep == NONE) {
{ err = acpi_init();
err = do_init(); if (OK != err) {
if (OK != err)
{
panic("libacpi: ds_retrieve_label_endpt failed for 'acpi': %d", err); panic("libacpi: ds_retrieve_label_endpt failed for 'acpi': %d", err);
} }
} }

9
minix/lib/libacpi/acpi.h
View File

@ -1,9 +0,0 @@
#ifndef LIBACPI_H_
#define LIBACPI_H_
#include <minix/com.h>
#include <minix/ipc.h>
int do_init(void);
#endif /* _LIBACPI_H_ */