[Linux-hls-cvs] hls/linux/include data.h,1.3,1.4 hls.h,1.2,1.3 interface-data.h,1.2,1.3 interface-fu
Status: Pre-Alpha
Brought to you by:
lucabe
Menu
▾
▴
[Linux-hls-cvs] hls/linux/include data.h,1.3,1.4 hls.h,1.2,1.3 interface-data.h,1.2,1.3 interface-funcs.h,1.2,1.3
|
From: <lu...@us...> - 2003-11-08 10:34:36
|
Update of /cvsroot/linux-hls/hls/linux/include
In directory sc8-pr-cvs1:/tmp/cvs-serv6094/linux/include
Modified Files:
data.h hls.h interface-data.h interface-funcs.h
Log Message:
Lot of changes....
- Unbreak the debugging stuff
- Some random cleanups
- Fixes in the RR scheduler (I hope... MAXIMUM_PRIORITY does not seem to be
a valid priority)
- Allow the RES scheduler to be scheduled (there's a fixme: some functions
still have to be properly implemented)
- change Q e T from long long to long in the RES scheduler
- Implement the "rt scheduler" stuff
Index: data.h
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/include/data.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** data.h 25 Feb 2003 09:18:55 -0000 1.3
--- data.h 8 Nov 2003 10:34:32 -0000 1.4
***************
*** 22,28 ****
--- 22,69 ----
#define PKTHREAD struct task_struct *
+
#define HLS_READY_REASON int
#define HLS_FASTCALL
+
+ /* Linux Real-Time priorities go from 0 to 99 */
+ #define HLS_SCHEDULING_PRIORITY 100
+ /* The priority is computed as 1000 + rt_priority...
+ * with rp_priority = -2000, it results -1000
+ * and the task will never be scheduled
+ */
+ #define HLS_IDLE_PRIORITY -2000
+
+ typedef enum _HLS_CTL_COMMAND {
+ HLS_CMD_DUMP_COUNTS = 100,
+ HLS_CMD_WHICH_PROC = 101,
+ HLS_CMD_SET_DEBUG_LEVEL = 102,
+ HLS_CMD_RES = 103,
+ HLS_CMD_SET_TIMERRES = 104,
+ HLS_CMD_GET_STOLEN = 105,
+ HLS_CMD_LIST_RES = 106,
+ HLS_CMD_END_RES = 107,
+ HLS_CMD_NEW_INSTANCE = 108,
+ HLS_CMD_SET_SHARE = 109,
+ HLS_CMD_SET_DEFAULT = 110,
+ HLS_CMD_DESTROY_INSTANCE = 111,
+ HLS_CMD_NULL_MSG = 112,
+ HLS_CMD_MOVE_THREAD = 113
+ } HLS_CTL_COMMAND;
+
+
+ struct hls_param {
+ unsigned long int signature;
+ HLS_CTL_COMMAND command;
+ char *scheduler;
+ int sched_data_size;
+ void *sched_data;
+ };
+
+
+ #define SCHED_HLS 10
+
+ #define HLS_SIGNATURE 0x56
+
#endif /* __DATA__ */
Index: hls.h
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/include/hls.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hls.h 25 Feb 2003 09:18:55 -0000 1.2
--- hls.h 8 Nov 2003 10:34:32 -0000 1.3
***************
*** 16,56 ****
};
- /* Linux Real-Time priorities go from 0 to 99 */
- #define HLS_SCHEDULING_PRIORITY 100
- /* The priority is computed as 1000 + rt_priority...
- * with rp_priority = -2000, it results -1000
- * and the task will never be scheduled
- */
- #define HLS_IDLE_PRIORITY -2000
-
-
- typedef enum _HLS_CTL_COMMAND {
- HLS_CMD_DUMP_COUNTS = 100,
- HLS_CMD_WHICH_PROC = 101,
- HLS_CMD_SET_DEBUG_LEVEL = 102,
- HLS_CMD_RES = 103,
- HLS_CMD_SET_TIMERRES = 104,
- HLS_CMD_GET_STOLEN = 105,
- HLS_CMD_LIST_RES = 106,
- HLS_CMD_END_RES = 107,
- HLS_CMD_NEW_INSTANCE = 108,
- HLS_CMD_SET_SHARE = 109,
- HLS_CMD_SET_DEFAULT = 110,
- HLS_CMD_DESTROY_INSTANCE = 111,
- HLS_CMD_NULL_MSG = 112,
- HLS_CMD_MOVE_THREAD = 113
- } HLS_CTL_COMMAND;
-
- struct hls_param {
- unsigned long int signature;
- HLS_CTL_COMMAND command;
- char *scheduler;
- int sched_data_size;
- void *sched_data;
- };
-
- #define SCHED_HLS 10
-
- #define HLS_SIGNATURE 0x56
-
#endif /* __HLS_H__ */
--- 16,18 ----
Index: interface-data.h
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/include/interface-data.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** interface-data.h 25 Feb 2003 09:18:55 -0000 1.2
--- interface-data.h 8 Nov 2003 10:34:32 -0000 1.3
***************
*** 12,20 ****
#define __INTERFACE_DATA__
#define SCHAR signed char
#define ULONG unsigned long
typedef long long _int64;
! typedef _int64 WNT_TIME; /* FIXME: This must be removed! */
#define MAXIMUM_PROCESSORS 32
--- 12,26 ----
#define __INTERFACE_DATA__
+ #define LIST_ENTRY struct list_head
+ typedef LIST_ENTRY *PRLIST_ENTRY;
+
+
+
+
#define SCHAR signed char
#define ULONG unsigned long
typedef long long _int64;
! typedef long int WNT_TIME; /* FIXME: This must be removed! */
#define MAXIMUM_PROCESSORS 32
***************
*** 22,30 ****
#define PROCT ULONG
#define KPRIORITY int
! #define MAXIMUM_PRIORITY 32 /* FIXME: Shouldn't this go in rr.h??? */
#define CONTAINING_RECORD(address, type, field) ((type *)( \
(char *)(address) - \
(unsigned long)(&((type *)0)->field)))
#endif /* __INTERFACE_DATA__ */
--- 28,44 ----
#define PROCT ULONG
#define KPRIORITY int
! #define HLS_MAXIMUM_PRIORITY 32 /* FIXME: Shouldn't this go in rr.h??? */
#define CONTAINING_RECORD(address, type, field) ((type *)( \
(char *)(address) - \
(unsigned long)(&((type *)0)->field)))
+
+ typedef enum _HLS_BOOL {
+ HLS_FALSE = 0, HLS_TRUE = 0x600 // don't change this value
+ } HLS_BOOL;
+ typedef enum _HLS_STATUS {
+ HLS_SUCCESS = 0xadd0, HLS_NOROOM, HLS_INVALID_PARAMETER
+ } HLS_STATUS;
+
#endif /* __INTERFACE_DATA__ */
Index: interface-funcs.h
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/include/interface-funcs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** interface-funcs.h 25 Feb 2003 09:18:55 -0000 1.2
--- interface-funcs.h 8 Nov 2003 10:34:32 -0000 1.3
***************
*** 45,53 ****
#define hls_hard_printk printk
#define DbgPrint printk
#define hls_panic panic
!
! #define LIST_ENTRY struct list_head
#define LIST_NEXT_ENTRY(l) (l->next)
- typedef LIST_ENTRY *PRLIST_ENTRY;
extern inline void *hls_malloc (int size)
--- 45,54 ----
#define hls_hard_printk printk
#define DbgPrint printk
+ #if 0
#define hls_panic panic
! #else
! #define hls_panic(a) BUG()
! #endif
#define LIST_NEXT_ENTRY(l) (l->next)
extern inline void *hls_malloc (int size)
|
