[Linux-hls-cvs] hls/linux Makefile,1.6,1.7 hls_ctl.c,1.8,1.9 init.c,1.7,1.8 procfs.c,1.7,1.8

[<lu...@us...>]

Update of /cvsroot/linux-hls/hls/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv14351/linux

Modified Files:
	Makefile hls_ctl.c init.c procfs.c 
Log Message:
- Some cleanup & code reorganization
- Fix the simulator's compilation
- Better logging macros for the simulator backend


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	25 Nov 2002 11:33:32 -0000	1.6
--- Makefile	29 Nov 2003 09:11:35 -0000	1.7
***************
*** 24,28 ****
  
  OBJS = hls_sched_th.o hls_hooks.o hls_sched_root.o hls_sched_join.o \
! 	hls_utils.o hls_ctl.o hls_timers.o hls_debug.o \
  	init.o bottom.o misc.o procfs.o
  
--- 24,28 ----
  
  OBJS = hls_sched_th.o hls_hooks.o hls_sched_root.o hls_sched_join.o \
! 	hls_utils.o hls_names.o hls_ctl.o hls_timers.o hls_debug.o \
  	init.o bottom.o misc.o procfs.o
  

Index: hls_ctl.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/hls_ctl.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** hls_ctl.c	8 Nov 2003 10:34:32 -0000	1.8
--- hls_ctl.c	29 Nov 2003 09:11:35 -0000	1.9
***************
*** 10,19 ****
   */
  
! #include "hls_common.h"
! #include "hls_internal.h"
  
! #include "thr.h"
! #include "hls.h"
! #include "hls_hooks.h"
  
  
--- 10,19 ----
   */
  
! #include <hls_common.h>
! #include <hls_internal.h>
  
! #include <thr.h>
! #include <hls.h>
! #include <hls_hooks.h>
  
  

Index: init.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/init.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** init.c	8 Nov 2003 10:34:32 -0000	1.7
--- init.c	29 Nov 2003 09:11:35 -0000	1.8
***************
*** 39,45 ****
  MODULE_LICENSE("GPL");
  
  int hls_setsched(pid_t pid, int policy, struct sched_param *param);
- 
- 
  extern void HLSInit(void);
  extern void HLSDeinit (void);
--- 39,44 ----
  MODULE_LICENSE("GPL");
  
+ /* FIXME: These prototypes should be removed... */
  int hls_setsched(pid_t pid, int policy, struct sched_param *param);
  extern void HLSInit(void);
  extern void HLSDeinit (void);

Index: procfs.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/procfs.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** procfs.c	8 Nov 2003 10:34:32 -0000	1.7
--- procfs.c	29 Nov 2003 09:11:35 -0000	1.8
***************
*** 22,27 ****
  #include <linux/slab.h>
  
! #include "data.h"
! #include "interface-data.h"
  #include <hls_internal.h>
  
--- 22,27 ----
  #include <linux/slab.h>
  
! #include <data.h>
! #include <interface-data.h>
  #include <hls_internal.h>
  
***************
*** 31,34 ****
--- 31,35 ----
  	*instances_file, *tasks_file, *default_file, *rt_file;
  
+ #if 0
  extern char *hls_scheduler_name(int i);
  extern char *hls_instance_name(int i);
***************
*** 40,43 ****
--- 41,45 ----
  extern void SetDefPriForSched(char Pri, struct HLS_SCHED_INSTANCE *Inst);
  extern int hls_setparam_ascii(struct HLS_SCHED_INSTANCE *inst, char *param);
+ #endif
  
  static int hls_proc_read_rt(char *p, char **s, off_t o,