| /shark/trunk/oslib/ll/i386/x-bios.h |
|---|
| 61,14 → 61,14 |
| typedef struct { |
| /* The GDT linear address inheritable from X */ |
| DWORD GDT_base; |
| DWORD _GDT_base; |
| /* These are used for BIOS calling */ |
| X_REGS16 ir; |
| X_REGS16 or; |
| X_SREGS16 sr; |
| DWORD irqno; |
| X_REGS16 _ir; |
| X_REGS16 _or; |
| X_SREGS16 _sr; |
| DWORD _irqno; |
| /* This is the X version */ |
| DWORD ver; |
| DWORD _ver; |
| } X_CALLBIOS; |
| X_CALLBIOS * x_bios_address(void); |
| /shark/trunk/oslib/ll/i386/hw-instr.h |
|---|
| 26,7 → 26,6 |
| #define __LL_I386_HW_INSTR_H__ |
| #include <ll/i386/defs.h> |
| BEGIN_DEF |
| #define INLINE_OP __inline__ static |
| 35,6 → 34,8 |
| /* Low Level I/O funcs are in a separate file (by Luca) */ |
| #include <ll/i386/hw-io.h> |
| BEGIN_DEF |
| INLINE_OP WORD get_CS(void) |
| {WORD r; __asm__ __volatile__ ("movw %%cs,%0" : "=q" (r)); return(r);} |
| /shark/trunk/oslib/ll/i386/stdio.h |
|---|
| 23,10 → 23,10 |
| #define __LL_I386_STDIO_H__ |
| #include <ll/i386/defs.h> |
| #include <ll/stdarg.h> |
| BEGIN_DEF |
| #include <ll/stdarg.h> |
| int vsprintf(char *buf,char *fmt,va_list parms); |
| int vksprintf(char *buf,char *fmt,va_list parms); |
| int sprintf(char *buf,char *fmt,...) __attribute__((__format__(printf,2,3))); |
| /shark/trunk/oslib/ll/stdarg.h |
|---|
| 16,11 → 16,11 |
| /** |
| ------------ |
| CVS : $Id: stdarg.h,v 1.1 2003-01-30 09:43:03 pj Exp $ |
| CVS : $Id: stdarg.h,v 1.2 2003-03-17 09:27:56 pj Exp $ |
| File: $File$ |
| Revision: $Revision: 1.1 $ |
| Last update: $Date: 2003-01-30 09:43:03 $ |
| Revision: $Revision: 1.2 $ |
| Last update: $Date: 2003-03-17 09:27:56 $ |
| ------------ |
| lowlevel's stdarg.h |
| 52,7 → 52,6 |
| #define __dj_include_stdarg_h_ |
| #include <ll/i386/defs.h> |
| BEGIN_DEF |
| #ifndef __dj_ENFORCE_ANSI_FREESTANDING |
| 62,6 → 61,8 |
| #include <ll/sys/types.h> |
| BEGIN_DEF |
| #define __dj_va_rounded_size(T) \ |
| (((sizeof (T) + sizeof (int) - 1) / sizeof (int)) * sizeof (int)) |
| /shark/trunk/oslib/ll/sys/ll/aspace.h |
|---|
| 25,7 → 25,6 |
| #define __LL_SYS_LL_ASPACE_H__ |
| #include <ll/i386/defs.h> |
| BEGIN_DEF |
| /* I dont't know if we really need all these things... */ |
| #include <ll/i386/hw-data.h> |
| 33,6 → 32,8 |
| #include <ll/i386/hw-func.h> |
| #include <ll/i386/tss-ctx.h> |
| BEGIN_DEF |
| struct as { |
| DWORD base; |
| DWORD limit; |
| /shark/trunk/oslib/ll/sys/ll/ll-func.h |
|---|
| 52,5 → 52,5 |
| /* occurs and we do not know what context is active */ |
| void ll_abort(int code); |
| BEGIN_DEF |
| END_DEF |
| #endif /* __LL_SYS_LL_LL_MEM_H_ */ |
| /shark/trunk/oslib/ll/sys/ll/event.h |
|---|
| 25,10 → 25,11 |
| #define __LL_SYS_LL_EVENT_H__ |
| #include <ll/i386/defs.h> |
| #include <ll/sys/ll/time.h> |
| #include <ll/sys/ll/ll-data.h> |
| BEGIN_DEF |
| #include <ll/sys/ll/time.h> |
| #include <ll/sys/ll/ll-data.h> |
| #define MAX_EVENT 100 |
| struct event { |
| /shark/trunk/oslib/xlib/xinfo.c |
|---|
| 45,7 → 45,7 |
| WORD X_version(void) |
| { |
| X_CALLBIOS *x_bios = x_bios_address(); |
| return(x_bios->ver); |
| return(x_bios->_ver); |
| } |
| void X_meminfo(LIN_ADDR *b1,DWORD *s1,LIN_ADDR *b2,DWORD *s2) |
| /shark/trunk/oslib/xlib/xbios.c |
|---|
| 38,14 → 38,14 |
| X_CALLBIOS *xbc = x_bios_address(); |
| /* Send interrupt request & register through the X_Info structure */ |
| xbc->irqno = service; |
| memcpy(&(xbc->ir),in,sizeof(X_REGS16)); |
| memcpy(&(xbc->sr),s,sizeof(X_SREGS16)); |
| xbc->_irqno = service; |
| memcpy(&(xbc->_ir),in,sizeof(X_REGS16)); |
| memcpy(&(xbc->_sr),s,sizeof(X_SREGS16)); |
| /* Back to RM to execute the BIOS routine */ |
| _x_callBIOS(); |
| /* Get the return register values */ |
| memcpy(out,&(xbc->or),sizeof(X_REGS16)); |
| memcpy(s,&(xbc->sr),sizeof(X_SREGS16)); |
| memcpy(out,&(xbc->_or),sizeof(X_REGS16)); |
| memcpy(s,&(xbc->_sr),sizeof(X_SREGS16)); |
| } |