Undo the use of #include <...> because it caused some errors.
This commit is contained in:
parent
b5e7af96c9
commit
df60646f98
@ -13,7 +13,7 @@ p = ../libpci
|
||||
# programs, flags, etc.
|
||||
MAKE = exec make
|
||||
CC = exec cc
|
||||
CFLAGS = -I$i -I.. $(CPROFILE)
|
||||
CFLAGS = -I$i $(CPROFILE)
|
||||
LDFLAGS = -i -L../libdriver
|
||||
LIBS = -ldriver -lsys -ltimers
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include <drivers.h>
|
||||
#include <libdriver/driver.h>
|
||||
#include <libdriver/drvlib.h>
|
||||
#include "../drivers.h"
|
||||
#include "../libdriver/driver.h"
|
||||
#include "../libdriver/drvlib.h"
|
||||
|
||||
#define VERBOSE 0 /* display identify messages during boot */
|
||||
#define ENABLE_ATAPI 1 /* add ATAPI cd-rom support to driver */
|
||||
|
@ -12,7 +12,7 @@ d = ..
|
||||
# programs, flags, etc.
|
||||
MAKE = exec make
|
||||
CC = exec cc
|
||||
CFLAGS = -I$i -I.. $(CPROFILE)
|
||||
CFLAGS = -I$i $(CPROFILE)
|
||||
LDFLAGS = -i -L../libdriver
|
||||
LIBS = -ldriver -lsys -lsys -ltimers
|
||||
|
||||
|
@ -20,9 +20,9 @@
|
||||
* 14 May 2000 by Kees J. Bot: d-d/i rewrite.
|
||||
*/
|
||||
|
||||
#include <drivers.h>
|
||||
#include <libdriver/driver.h>
|
||||
#include <libdriver/drvlib.h>
|
||||
#include "../drivers.h"
|
||||
#include "../libdriver/driver.h"
|
||||
#include "../libdriver/drvlib.h"
|
||||
#include <minix/sysutil.h>
|
||||
#include <minix/safecopies.h>
|
||||
#include <sys/ioc_disk.h>
|
||||
|
@ -12,7 +12,7 @@ d = ..
|
||||
# programs, flags, etc.
|
||||
MAKE = exec make
|
||||
CC = exec cc
|
||||
CFLAGS = -I.. -I$i $(CPROFILE)
|
||||
CFLAGS = -I$i $(CPROFILE)
|
||||
LDFLAGS = -i -L../libdriver
|
||||
LIBS = -ldriver -lsys -ltimers
|
||||
|
||||
|
@ -300,7 +300,7 @@ PUBLIC int last_transfer_opcode;
|
||||
/*===========================================================================*
|
||||
* floppy_task *
|
||||
*===========================================================================*/
|
||||
PUBLIC int main()
|
||||
PUBLIC int main(void)
|
||||
{
|
||||
/* SEF local startup. */
|
||||
sef_local_startup();
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include <drivers.h>
|
||||
#include <libdriver/driver.h>
|
||||
#include <libdriver/drvlib.h>
|
||||
#include "../drivers.h"
|
||||
#include "../libdriver/driver.h"
|
||||
#include "../libdriver/drvlib.h"
|
||||
|
||||
|
@ -11,7 +11,7 @@ d = ..
|
||||
# programs, flags, etc.
|
||||
MAKE = exec make
|
||||
CC = exec cc
|
||||
CFLAGS = -I.. -I$i $(CPROFILE)
|
||||
CFLAGS = -I$i $(CPROFILE)
|
||||
LDFLAGS = -i -L../libdriver
|
||||
LIBS = -ldriver -lsys
|
||||
LIB_DEP = ../libdriver/libdriver.a
|
||||
|
@ -1,6 +1,6 @@
|
||||
/* Includes. */
|
||||
#include <drivers.h>
|
||||
#include <libdriver/driver.h>
|
||||
#include "../drivers.h"
|
||||
#include "../libdriver/driver.h"
|
||||
#include <minix/type.h>
|
||||
#include <minix/const.h>
|
||||
#include <minix/com.h>
|
||||
|
@ -11,7 +11,7 @@ d = ..
|
||||
|
||||
# programs, flags, etc.
|
||||
CC = exec cc
|
||||
CFLAGS = -I.. -I$i $(CPROFILE)
|
||||
CFLAGS = -I$i $(CPROFILE)
|
||||
LDFLAGS = -i
|
||||
LIBS = -lsys -ltimers
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
#ifndef _HERMES_H
|
||||
#define _HERMES_H
|
||||
|
||||
#include <drivers.h>
|
||||
#include "../drivers.h"
|
||||
#include <net/gen/ether.h>
|
||||
#include <net/gen/eth_io.h>
|
||||
#include <net/hton.h>
|
||||
|
@ -12,7 +12,7 @@ d = ..
|
||||
# programs, flags, etc.
|
||||
MAKE = exec make
|
||||
CC = exec cc
|
||||
CFLAGS = -I.. -I../.. -I$i $(CPROFILE)
|
||||
CFLAGS = -I$i $(CPROFILE)
|
||||
LDFLAGS = -i
|
||||
LIBS = -lsys -ltimers
|
||||
|
||||
|
@ -4,7 +4,7 @@ ibm/rtl8139.h
|
||||
Created: Aug 2003 by Philip Homburg <philip@cs.vu.nl>
|
||||
*/
|
||||
|
||||
#include <drivers.h>
|
||||
#include "../drivers.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
@ -28,9 +28,9 @@ Created: Aug 2003 by Philip Homburg <philip@cs.vu.nl>
|
||||
#include <assert.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/ioc_memory.h>
|
||||
#include <kernel/const.h>
|
||||
#include <kernel/config.h>
|
||||
#include <kernel/type.h>
|
||||
#include "../../kernel/const.h"
|
||||
#include "../../kernel/config.h"
|
||||
#include "../../kernel/type.h"
|
||||
|
||||
#define RL_IDR 0x00 /* Ethernet address
|
||||
* Note: RL_9346CR_EEM_CONFIG mode is
|
||||
|
@ -12,7 +12,7 @@ d = ..
|
||||
# programs, flags, etc.
|
||||
MAKE = exec make
|
||||
CC = exec cc
|
||||
CFLAGS = -I.. -I../.. -I$i $(CPROFILE)
|
||||
CFLAGS = -I$i $(CPROFILE)
|
||||
LDFLAGS = -i
|
||||
LIBS = -lsys -ltimers
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <drivers.h>
|
||||
#include "../drivers.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
@ -26,9 +26,9 @@
|
||||
#include <sys/types.h>
|
||||
#include <assert.h>
|
||||
#include <unistd.h>
|
||||
#include <kernel/const.h>
|
||||
#include <kernel/config.h>
|
||||
#include <kernel/type.h>
|
||||
#include "../../kernel/const.h"
|
||||
#include "../../kernel/config.h"
|
||||
#include "../../kernel/type.h"
|
||||
|
||||
#define debug 1
|
||||
#define printW() ((void)0)
|
||||
|
@ -11,7 +11,7 @@ d = ..
|
||||
|
||||
# programs, flags, etc.
|
||||
CC = exec cc
|
||||
CFLAGS = -I.. -I$i $(CPROFILE)
|
||||
CFLAGS = -I$i $(CPROFILE)
|
||||
LDFLAGS = -i
|
||||
LIBS = -lsys -ltimers
|
||||
|
||||
|
@ -4,7 +4,7 @@ ti1225.c
|
||||
Created: Dec 2005 by Philip Homburg
|
||||
*/
|
||||
|
||||
#include <drivers.h>
|
||||
#include "../drivers.h"
|
||||
#include <ibm/pci.h>
|
||||
#include <sys/vm_i386.h>
|
||||
|
||||
|
@ -71,8 +71,6 @@
|
||||
#include <sys/time.h>
|
||||
#include <sys/select.h>
|
||||
|
||||
extern int irq_hook_id;
|
||||
|
||||
unsigned long kbd_irq_set = 0;
|
||||
unsigned long rs_irq_set = 0;
|
||||
|
||||
|
@ -106,7 +106,6 @@ typedef struct tty {
|
||||
/* Memory allocated in tty.c, so extern here. */
|
||||
extern tty_t tty_table[NR_CONS+NR_RS_LINES+NR_PTYS];
|
||||
extern int ccurrent; /* currently visible console */
|
||||
extern int irq_hook_id; /* hook id for keyboard irq */
|
||||
extern u32_t system_hz; /* system clock frequency */
|
||||
|
||||
extern unsigned long kbd_irq_set;
|
||||
|
@ -43,7 +43,6 @@ PRIVATE int nfreepdes = 0, freepdes[WANT_FREEPDES], inusepde = NOPDE;
|
||||
|
||||
FORWARD _PROTOTYPE( u32_t phys_get32, (phys_bytes v) );
|
||||
FORWARD _PROTOTYPE( void vm_enable_paging, (void) );
|
||||
FORWARD _PROTOTYPE( void set_cr3, (void) );
|
||||
|
||||
|
||||
/* *** Internal VM Functions *** */
|
||||
|
Loading…
x
Reference in New Issue
Block a user