Index: media/RealtimeAlloc.h
===================================================================
--- media/RealtimeAlloc.h	(revision 28851)
+++ media/RealtimeAlloc.h	(working copy)
@@ -47,5 +47,5 @@
 }
 #endif
 
-#endif // _REALTIME_ALLOC_H
+#endif /* _REALTIME_ALLOC_H */
 
Index: kernel/fs_query.h
===================================================================
--- kernel/fs_query.h	(revision 28851)
+++ kernel/fs_query.h	(working copy)
@@ -13,12 +13,12 @@
 /* Flags for fs_open_[live_]query() */
 
 #define B_LIVE_QUERY		0x00000001
-	// Note, if you specify B_LIVE_QUERY, you have to use fs_open_live_query();
-	// it will be ignored in fs_open_query().
+	/* Note, if you specify B_LIVE_QUERY, you have to use fs_open_live_query(); */
+	/* it will be ignored in fs_open_query(). */
 #define B_QUERY_NON_INDEXED	0x00000002
-	// Only enable this feature for non time-critical things, it might
-	// take a long time to proceed.
-	// Also, not every file system might support this feature.
+	/* Only enable this feature for non time-critical things, it might */
+	/* take a long time to proceed. */
+	/* Also, not every file system might support this feature. */
 
 
 #ifdef  __cplusplus
Index: kernel/fs_volume.h
===================================================================
--- kernel/fs_volume.h	(revision 28851)
+++ kernel/fs_volume.h	(working copy)
@@ -5,7 +5,7 @@
 #ifndef _FS_VOLUME_H
 #define	_FS_VOLUME_H
 
-//!	File System volume functions
+/*!	File System volume functions */
 
 #include <OS.h>
 
Index: kernel/fs_attr.h
===================================================================
--- kernel/fs_attr.h	(revision 28851)
+++ kernel/fs_attr.h	(working copy)
@@ -25,9 +25,9 @@
 extern int		fs_remove_attr(int fd, const char *attribute);
 extern int		fs_stat_attr(int fd, const char *attribute, struct attr_info *attrInfo);
 
-// ToDo: the following three functions are not part of the R5 API, and
-// are only preliminary - they may change or be removed at any point
-//extern int	fs_open_attr(const char *path, const char *attribute, uint32 type, int openMode);
+/* ToDo: the following three functions are not part of the R5 API, and */
+/* are only preliminary - they may change or be removed at any point */
+/*extern int	fs_open_attr(const char *path, const char *attribute, uint32 type, int openMode); */
 extern int		fs_open_attr(int fd, const char *attribute, uint32 type, int openMode);
 extern int		fs_close_attr(int fd);
 
Index: kernel/image.h
===================================================================
--- kernel/image.h	(revision 28851)
+++ kernel/image.h	(working copy)
@@ -35,33 +35,33 @@
 	int32		data_size;
 } image_info;
 
-// flags for clear_caches()
+/* flags for clear_caches() */
 #define B_FLUSH_DCACHE				0x0001	/* data cache */
 #define B_FLUSH_ICACHE				0x0004	/* instruction cache */
 #define B_INVALIDATE_DCACHE			0x0002
 #define B_INVALIDATE_ICACHE			0x0008
 
-// symbol types
+/* symbol types */
 #define	B_SYMBOL_TYPE_DATA			0x1
 #define	B_SYMBOL_TYPE_TEXT			0x2
 #define B_SYMBOL_TYPE_ANY			0x5
 
-// initialization/termination functions of shared objects
+/* initialization/termination functions of shared objects */
 #define	B_INIT_BEFORE_FUNCTION_NAME	"initialize_before"
 #define B_INIT_AFTER_FUNCTION_NAME	"initialize_after"
 #define	B_TERM_BEFORE_FUNCTION_NAME	"terminate_before"
 #define B_TERM_AFTER_FUNCTION_NAME	"terminate_after"
 
-// flags for _kern_load_image() (private API)
+/* flags for _kern_load_image() (private API) */
 enum {
 	B_WAIT_TILL_LOADED	= 0x01,
-		// Wait till the loader has loaded and relocated
-		// (but not yet initialized) the application
-		// image and all dependencies. If not supplied,
-		// the function returns before the loader
-		// started to do anything at all, i.e. it
-		// returns success, even if the executable
-		// doesn't exist.
+		/* Wait till the loader has loaded and relocated */
+		/* (but not yet initialized) the application */
+		/* image and all dependencies. If not supplied, */
+		/* the function returns before the loader */
+		/* started to do anything at all, i.e. it */
+		/* returns success, even if the executable */
+		/* doesn't exist. */
 };
 
 #ifdef __cplusplus
Index: kernel/disk_scanner.h
===================================================================
--- kernel/disk_scanner.h	(revision 28851)
+++ kernel/disk_scanner.h	(working copy)
@@ -11,7 +11,7 @@
 #include <SupportDefs.h>
 
 
-// session flags
+/* session flags */
 enum {
 	B_DATA_SESSION			= 0x01,	/* data session */
 	B_VIRTUAL_SESSION		= 0x02,	/* e.g. hard disk */
@@ -25,7 +25,7 @@
 	uint32	flags;				/* session flags */
 } session_info;
 
-// partition flags
+/* partition flags */
 enum {
 	B_HIDDEN_PARTITION		= 0x01,	/* non-file system partition */
 	B_VIRTUAL_PARTITION		= 0x02,	/* e.g. floppy */
@@ -49,7 +49,7 @@
 extern "C" {
 #endif
 
-// getting infos
+/* getting infos */
 status_t get_nth_session_info(int deviceFD, int32 index,
 							  session_info *sessionInfo);
 status_t get_nth_partition_info(int deviceFD, int32 sessionIndex,
@@ -57,20 +57,20 @@
 								extended_partition_info *partitionInfo,
 								char *partitionMapName);
 
-// partitioning
+/* partitioning */
 status_t get_partitioning_parameters(int deviceFD, int32 sessionIndex,
 									 const char *identifier, char *buffer,
 									 size_t bufferSize, size_t *actualSize);
 status_t partition_session(int deviceFD, int32 sessionIndex,
 						   const char *identifier, const char *parameters);
 
-// initialization
+/* initialization */
 status_t get_fs_initialization_parameters(int deviceFD, int32 sessionIndex,
 										  int32 partitionIndex,
 										  const char *fileSystem, char *buffer,
 										  size_t bufferSize,
 										  size_t *actualSize);
-// TODO: Move to <unistd.h>. It fits better there.
+/* TODO: Move to <unistd.h>. It fits better there. */
 status_t initialize_volume(const char *where, const char *fileSystem, 
 						   const char *volumeName, const char *parameters);
 
Index: kernel/fs_info.h
===================================================================
--- kernel/fs_info.h	(revision 28851)
+++ kernel/fs_info.h	(working copy)
@@ -16,7 +16,7 @@
 #define	B_FS_HAS_MIME			0x00010000
 #define	B_FS_HAS_ATTR			0x00020000
 #define	B_FS_HAS_QUERY			0x00040000
-// those additions are preliminary and may be removed
+/* those additions are preliminary and may be removed */
 #define B_FS_HAS_SELF_HEALING_LINKS		0x00080000
 #define B_FS_HAS_ALIASES				0x00100000
 #define B_FS_SUPPORTS_NODE_MONITORING	0x00200000
Index: kernel/debugger.h
===================================================================
--- kernel/debugger.h	(revision 28851)
+++ kernel/debugger.h	(working copy)
@@ -10,7 +10,7 @@
 #include <image.h>
 #include <OS.h>
 
-// include architecture specific definitions
+/* include architecture specific definitions */
 #ifdef __INTEL__
 	#include <arch/x86/arch_debugger.h>
 #elif __POWERPC__
@@ -33,9 +33,9 @@
 extern status_t	debug_thread(thread_id thread);
 extern void		wait_for_debugger(void);
 
-// EXPERIMENTAL: Self-debugging functions. Will fail when a team debugger is
-// installed. A breakpoint/watchpoint hit will cause the default debugger to
-// be installed for the team.
+/* EXPERIMENTAL: Self-debugging functions. Will fail when a team debugger is */
+/* installed. A breakpoint/watchpoint hit will cause the default debugger to */
+/* be installed for the team. */
 extern status_t	set_debugger_breakpoint(void *address);
 extern status_t	clear_debugger_breakpoint(void *address);
 extern status_t	set_debugger_watchpoint(void *address, uint32 type,
@@ -43,12 +43,12 @@
 extern status_t	clear_debugger_watchpoint(void *address);
 
 
-// team debugging flags
+/* team debugging flags */
 enum {
-	// event mask: If a flag is set, any of the team's threads will stop when
-	// the respective event occurs. All flags are enabled by default. Always
-	// enabled are debugger() calls and hardware exceptions, as well as the
-	// deletion of the debugged team.
+	/* event mask: If a flag is set, any of the team's threads will stop when */
+	/* the respective event occurs. All flags are enabled by default. Always */
+	/* enabled are debugger() calls and hardware exceptions, as well as the */
+	/* deletion of the debugged team. */
 	B_TEAM_DEBUG_SIGNALS						= 0x00010000,
 	B_TEAM_DEBUG_PRE_SYSCALL					= 0x00020000,
 	B_TEAM_DEBUG_POST_SYSCALL					= 0x00040000,
@@ -56,28 +56,28 @@
 	B_TEAM_DEBUG_THREADS						= 0x00100000,
 	B_TEAM_DEBUG_IMAGES							= 0x00200000,
 
-	// new thread handling
+	/* new thread handling */
 	B_TEAM_DEBUG_STOP_NEW_THREADS				= 0x01000000,
 
 	B_TEAM_DEBUG_USER_FLAG_MASK					= 0xffff0000,
 };
 
-// per-thread debugging flags
+/* per-thread debugging flags */
 enum {
-	// event mask: If a flag is set, the thread will stop when the respective
-	// event occurs. If there is a corresponding team flag, it is sufficient,
-	// if either is set. Per default none of the flags is set.
+	/* event mask: If a flag is set, the thread will stop when the respective */
+	/* event occurs. If there is a corresponding team flag, it is sufficient, */
+	/* if either is set. Per default none of the flags is set. */
 	B_THREAD_DEBUG_PRE_SYSCALL					= 0x00010000,
 	B_THREAD_DEBUG_POST_SYSCALL					= 0x00020000,
 
-	// child thread handling
+	/* child thread handling */
 	B_THREAD_DEBUG_STOP_CHILD_THREADS			= 0x00100000,
 	B_THREAD_DEBUG_SYSCALL_TRACE_CHILD_THREADS	= 0x00200000,
 
 	B_THREAD_DEBUG_USER_FLAG_MASK				= 0xffff0000,
 };
 
-// in case of a B_EXCEPTION_OCCURRED event: the type of the exception
+/* in case of a B_EXCEPTION_OCCURRED event: the type of the exception */
 typedef enum {
 	B_NON_MASKABLE_INTERRUPT	= 0,
 	B_MACHINE_CHECK_EXCEPTION,
@@ -93,24 +93,24 @@
 	B_FLOATING_POINT_EXCEPTION,
 } debug_exception_type;
 
-// Value indicating how a stopped thread shall continue.
+/* Value indicating how a stopped thread shall continue. */
 enum {
-	B_THREAD_DEBUG_HANDLE_EVENT = 0,	// handle the event normally
-										// (e.g. a signal is delivered, a
-										// CPU fault kills the team,...)
-	B_THREAD_DEBUG_IGNORE_EVENT,		// ignore the event and continue as if
-										// it didn't occur (e.g. a signal or
-										// a CPU fault will be ignored)
+	B_THREAD_DEBUG_HANDLE_EVENT = 0,	/* handle the event normally */
+										/* (e.g. a signal is delivered, a */
+										/* CPU fault kills the team,...) */
+	B_THREAD_DEBUG_IGNORE_EVENT,		/* ignore the event and continue as if */
+										/* it didn't occur (e.g. a signal or */
+										/* a CPU fault will be ignored) */
 };
 
-// watchpoint types (ToDo: Check PPC support.)
+/* watchpoint types (ToDo: Check PPC support.) */
 enum {
-	B_DATA_READ_WATCHPOINT = 0,			// !x86
+	B_DATA_READ_WATCHPOINT = 0,			/* !x86 */
 	B_DATA_WRITE_WATCHPOINT,
 	B_DATA_READ_WRITE_WATCHPOINT,
 };
 
-// how to apply signal ignore masks
+/* how to apply signal ignore masks */
 typedef enum {
 	B_DEBUG_SIGNAL_MASK_AND	= 0,
 	B_DEBUG_SIGNAL_MASK_OR,
@@ -119,288 +119,288 @@
 
 #define B_DEBUG_SIGNAL_TO_MASK(signal) (1ULL << ((signal) - 1))
 
-// maximal number of bytes to read/write via B_DEBUG_MESSAGE_{READ,WRITE]_MEMORY
+/* maximal number of bytes to read/write via B_DEBUG_MESSAGE_{READ,WRITE]_MEMORY */
 enum {
 	B_MAX_READ_WRITE_MEMORY_SIZE	= 1024,
 };
 
-// messages to the debug nub thread
+/* messages to the debug nub thread */
 typedef enum {
-	B_DEBUG_MESSAGE_READ_MEMORY	= 0,	// read from the team's memory
-	B_DEBUG_MESSAGE_WRITE_MEMORY,		// write to the team's memory
-	B_DEBUG_MESSAGE_SET_TEAM_FLAGS,		// set the team's debugging flags
-	B_DEBUG_MESSAGE_SET_THREAD_FLAGS,	// set a thread's debugging flags
-	B_DEBUG_MESSAGE_CONTINUE_THREAD,	// continue a stopped thread
-	B_DEBUG_MESSAGE_SET_CPU_STATE,		// change a stopped thread's CPU state
-	B_DEBUG_MESSAGE_GET_CPU_STATE,		// get the thread's current CPU state
-	B_DEBUG_MESSAGE_SET_BREAKPOINT,		// set a breakpoint
-	B_DEBUG_MESSAGE_CLEAR_BREAKPOINT,	// clear a breakpoint
-	B_DEBUG_MESSAGE_SET_WATCHPOINT,		// set a watchpoint
-	B_DEBUG_MESSAGE_CLEAR_WATCHPOINT,	// clear a watchpoint
-	B_DEBUG_MESSAGE_SET_SIGNAL_MASKS,	// set/get a thread's masks of signals
-	B_DEBUG_MESSAGE_GET_SIGNAL_MASKS,	//  the debugger is interested in
-	B_DEBUG_MESSAGE_SET_SIGNAL_HANDLER,	// set/get a thread's signal handler for
-	B_DEBUG_MESSAGE_GET_SIGNAL_HANDLER,	//  a signal
+	B_DEBUG_MESSAGE_READ_MEMORY	= 0,	/* read from the team's memory */
+	B_DEBUG_MESSAGE_WRITE_MEMORY,		/* write to the team's memory */
+	B_DEBUG_MESSAGE_SET_TEAM_FLAGS,		/* set the team's debugging flags */
+	B_DEBUG_MESSAGE_SET_THREAD_FLAGS,	/* set a thread's debugging flags */
+	B_DEBUG_MESSAGE_CONTINUE_THREAD,	/* continue a stopped thread */
+	B_DEBUG_MESSAGE_SET_CPU_STATE,		/* change a stopped thread's CPU state */
+	B_DEBUG_MESSAGE_GET_CPU_STATE,		/* get the thread's current CPU state */
+	B_DEBUG_MESSAGE_SET_BREAKPOINT,		/* set a breakpoint */
+	B_DEBUG_MESSAGE_CLEAR_BREAKPOINT,	/* clear a breakpoint */
+	B_DEBUG_MESSAGE_SET_WATCHPOINT,		/* set a watchpoint */
+	B_DEBUG_MESSAGE_CLEAR_WATCHPOINT,	/* clear a watchpoint */
+	B_DEBUG_MESSAGE_SET_SIGNAL_MASKS,	/* set/get a thread's masks of signals */
+	B_DEBUG_MESSAGE_GET_SIGNAL_MASKS,	/*  the debugger is interested in */
+	B_DEBUG_MESSAGE_SET_SIGNAL_HANDLER,	/* set/get a thread's signal handler for */
+	B_DEBUG_MESSAGE_GET_SIGNAL_HANDLER,	/*  a signal */
 
-	B_DEBUG_MESSAGE_PREPARE_HANDOVER,	// prepares the debugged team for being
-										// handed over to another debugger;
-										// the new debugger can just invoke
-										// install_team_debugger()
+	B_DEBUG_MESSAGE_PREPARE_HANDOVER,	/* prepares the debugged team for being */
+										/* handed over to another debugger; */
+										/* the new debugger can just invoke */
+										/* install_team_debugger() */
 
-	B_DEBUG_START_PROFILER,				// start/stop sampling
-	B_DEBUG_STOP_PROFILER				//
+	B_DEBUG_START_PROFILER,				/* start/stop sampling */
+	B_DEBUG_STOP_PROFILER				/* */
 } debug_nub_message;
 
-// messages sent to the debugger
+/* messages sent to the debugger */
 typedef enum {
-	B_DEBUGGER_MESSAGE_THREAD_DEBUGGED = 0,	// debugger message in reaction to
-											// an invocation of debug_thread()
-	B_DEBUGGER_MESSAGE_DEBUGGER_CALL,		// thread called debugger()
-	B_DEBUGGER_MESSAGE_BREAKPOINT_HIT,		// thread hit a breakpoint
-	B_DEBUGGER_MESSAGE_WATCHPOINT_HIT,		// thread hit a watchpoint
-	B_DEBUGGER_MESSAGE_SINGLE_STEP,			// thread was single-stepped
-	B_DEBUGGER_MESSAGE_PRE_SYSCALL,			// begin of a syscall
-	B_DEBUGGER_MESSAGE_POST_SYSCALL,		// end of a syscall
-	B_DEBUGGER_MESSAGE_SIGNAL_RECEIVED,		// thread received a signal
-	B_DEBUGGER_MESSAGE_EXCEPTION_OCCURRED,	// an exception occurred
-	B_DEBUGGER_MESSAGE_TEAM_CREATED,		// the debugged team created a new
-											// one
-	B_DEBUGGER_MESSAGE_TEAM_DELETED,		// the debugged team is gone
-	B_DEBUGGER_MESSAGE_TEAM_EXEC,			// the debugged team executes exec()
-	B_DEBUGGER_MESSAGE_THREAD_CREATED,		// a thread has been created
-	B_DEBUGGER_MESSAGE_THREAD_DELETED,		// a thread has been deleted
-	B_DEBUGGER_MESSAGE_IMAGE_CREATED,		// an image has been created
-	B_DEBUGGER_MESSAGE_IMAGE_DELETED,		// an image has been deleted
+	B_DEBUGGER_MESSAGE_THREAD_DEBUGGED = 0,	/* debugger message in reaction to */
+											/* an invocation of debug_thread() */
+	B_DEBUGGER_MESSAGE_DEBUGGER_CALL,		/* thread called debugger() */
+	B_DEBUGGER_MESSAGE_BREAKPOINT_HIT,		/* thread hit a breakpoint */
+	B_DEBUGGER_MESSAGE_WATCHPOINT_HIT,		/* thread hit a watchpoint */
+	B_DEBUGGER_MESSAGE_SINGLE_STEP,			/* thread was single-stepped */
+	B_DEBUGGER_MESSAGE_PRE_SYSCALL,			/* begin of a syscall */
+	B_DEBUGGER_MESSAGE_POST_SYSCALL,		/* end of a syscall */
+	B_DEBUGGER_MESSAGE_SIGNAL_RECEIVED,		/* thread received a signal */
+	B_DEBUGGER_MESSAGE_EXCEPTION_OCCURRED,	/* an exception occurred */
+	B_DEBUGGER_MESSAGE_TEAM_CREATED,		/* the debugged team created a new */
+											/* one */
+	B_DEBUGGER_MESSAGE_TEAM_DELETED,		/* the debugged team is gone */
+	B_DEBUGGER_MESSAGE_TEAM_EXEC,			/* the debugged team executes exec() */
+	B_DEBUGGER_MESSAGE_THREAD_CREATED,		/* a thread has been created */
+	B_DEBUGGER_MESSAGE_THREAD_DELETED,		/* a thread has been deleted */
+	B_DEBUGGER_MESSAGE_IMAGE_CREATED,		/* an image has been created */
+	B_DEBUGGER_MESSAGE_IMAGE_DELETED,		/* an image has been deleted */
 
-	B_DEBUGGER_MESSAGE_PROFILER_UPDATE,		// flush the profiling buffer for a
-											// thread
+	B_DEBUGGER_MESSAGE_PROFILER_UPDATE,		/* flush the profiling buffer for a */
+											/* thread */
 
-	B_DEBUGGER_MESSAGE_HANDED_OVER,			// the debugged team has been
-											// handed over to another debugger
+	B_DEBUGGER_MESSAGE_HANDED_OVER,			/* the debugged team has been */
+											/* handed over to another debugger */
 } debug_debugger_message;
 
 
-// profile events -- when the buffer is in variable stack depth format, a sample
-// count entry >= B_DEBUG_PROFILE_EVENT_BASE indicates a profile event
+/* profile events -- when the buffer is in variable stack depth format, a sample */
+/* count entry >= B_DEBUG_PROFILE_EVENT_BASE indicates a profile event */
 enum {
 	B_DEBUG_PROFILE_EVENT_BASE				= 0x80000000,
 	B_DEBUG_PROFILE_EVENT_PARAMETER_MASK	= 0x0000ffff,
-		// & with to get the event's parameter count
+		/* & with to get the event's parameter count */
 
 	B_DEBUG_PROFILE_IMAGE_EVENT				= 0x80010001
-		// single parameter: the respective image event counter
+		/* single parameter: the respective image event counter */
 };
 
 
-// #pragma mark -
-// #pragma mark ----- messages to the debug nub thread -----
+/* #pragma mark - */
+/* #pragma mark ----- messages to the debug nub thread ----- */
 
-// B_DEBUG_MESSAGE_READ_MEMORY
+/* B_DEBUG_MESSAGE_READ_MEMORY */
 
 typedef struct {
-	port_id		reply_port;		// port to send the reply to
-	void		*address;		// address from which to read
-	int32		size;			// number of bytes to read
+	port_id		reply_port;		/* port to send the reply to */
+	void		*address;		/* address from which to read */
+	int32		size;			/* number of bytes to read */
 } debug_nub_read_memory;
 
 typedef struct {
-	status_t	error;			// B_OK, if reading went fine
-	int32		size;			// the number of bytes actually read
-								// > 0, iff error == B_OK
+	status_t	error;			/* B_OK, if reading went fine */
+	int32		size;			/* the number of bytes actually read */
+								/* > 0, iff error == B_OK */
 	char		data[B_MAX_READ_WRITE_MEMORY_SIZE];
-								// the read data
+								/* the read data */
 } debug_nub_read_memory_reply;
 
-// B_DEBUG_MESSAGE_WRITE_MEMORY
+/* B_DEBUG_MESSAGE_WRITE_MEMORY */
 
 typedef struct {
-	port_id		reply_port;		// port to send the reply to
-	void		*address;		// address to which to write
-	int32		size;			// number of bytes to write
+	port_id		reply_port;		/* port to send the reply to */
+	void		*address;		/* address to which to write */
+	int32		size;			/* number of bytes to write */
 	char		data[B_MAX_READ_WRITE_MEMORY_SIZE];
-								// data to write
+								/* data to write */
 } debug_nub_write_memory;
 
 typedef struct {
-	status_t	error;			// B_OK, if writing went fine
-	int32		size;			// the number of bytes actually written
+	status_t	error;			/* B_OK, if writing went fine */
+	int32		size;			/* the number of bytes actually written */
 } debug_nub_write_memory_reply;
 
-// B_DEBUG_MESSAGE_SET_TEAM_FLAGS
+/* B_DEBUG_MESSAGE_SET_TEAM_FLAGS */
 
 typedef struct {
-	int32		flags;			// the new team debugging flags
+	int32		flags;			/* the new team debugging flags */
 } debug_nub_set_team_flags;
 
-// B_DEBUG_MESSAGE_SET_THREAD_FLAGS
+/* B_DEBUG_MESSAGE_SET_THREAD_FLAGS */
 
 typedef struct {
-	thread_id	thread;			// the thread
-	int32		flags;			// the new thread debugging flags
+	thread_id	thread;			/* the thread */
+	int32		flags;			/* the new thread debugging flags */
 } debug_nub_set_thread_flags;
 
-// B_DEBUG_MESSAGE_CONTINUE_THREAD
+/* B_DEBUG_MESSAGE_CONTINUE_THREAD */
 
 typedef struct {
-	thread_id	thread;			// the thread
-	uint32		handle_event;	// how to handle the occurred event
-	bool		single_step;	// true == single step, false == run full speed
+	thread_id	thread;			/* the thread */
+	uint32		handle_event;	/* how to handle the occurred event */
+	bool		single_step;	/* true == single step, false == run full speed */
 } debug_nub_continue_thread;
 
-// B_DEBUG_MESSAGE_SET_CPU_STATE
+/* B_DEBUG_MESSAGE_SET_CPU_STATE */
 
 typedef struct {
-	thread_id			thread;				// the thread
-	debug_cpu_state		cpu_state;			// the new CPU state
+	thread_id			thread;				/* the thread */
+	debug_cpu_state		cpu_state;			/* the new CPU state */
 } debug_nub_set_cpu_state;
 
-// B_DEBUG_MESSAGE_GET_CPU_STATE
+/* B_DEBUG_MESSAGE_GET_CPU_STATE */
 
 typedef struct {
-	port_id					reply_port;		// port to send the reply to
-	thread_id				thread;			// the thread
+	port_id					reply_port;		/* port to send the reply to */
+	thread_id				thread;			/* the thread */
 } debug_nub_get_cpu_state;
 
 typedef struct {
-	status_t				error;		// != B_OK, if something went wrong
-										// (bad thread ID, thread not stopped)
-	debug_debugger_message	message;	// the reason why the thread stopped
-	debug_cpu_state			cpu_state;	// the thread's CPU state
+	status_t				error;		/* != B_OK, if something went wrong */
+										/* (bad thread ID, thread not stopped) */
+	debug_debugger_message	message;	/* the reason why the thread stopped */
+	debug_cpu_state			cpu_state;	/* the thread's CPU state */
 } debug_nub_get_cpu_state_reply;
 
-// B_DEBUG_MESSAGE_SET_BREAKPOINT
+/* B_DEBUG_MESSAGE_SET_BREAKPOINT */
 
 typedef struct {
-	port_id		reply_port;		// port to send the reply to
-	void		*address;		// breakpoint address
+	port_id		reply_port;		/* port to send the reply to */
+	void		*address;		/* breakpoint address */
 } debug_nub_set_breakpoint;
 
 typedef struct {
-	status_t	error;			// B_OK, if the breakpoint has been set
-								// successfully
+	status_t	error;			/* B_OK, if the breakpoint has been set */
+								/* successfully */
 } debug_nub_set_breakpoint_reply;
 
-// B_DEBUG_MESSAGE_CLEAR_BREAKPOINT
+/* B_DEBUG_MESSAGE_CLEAR_BREAKPOINT */
 
 typedef struct {
-	void		*address;		// breakpoint address
+	void		*address;		/* breakpoint address */
 } debug_nub_clear_breakpoint;
 
-// B_DEBUG_MESSAGE_SET_WATCHPOINT
+/* B_DEBUG_MESSAGE_SET_WATCHPOINT */
 
 typedef struct {
-	port_id		reply_port;		// port to send the reply to
-	void		*address;		// watchpoint address
-	uint32		type;			// watchpoint type (see type constants above)
-	int32		length;			// number of bytes to watch (typically 1, 2,
-								// 4); architecture specific alignment
-								// restrictions apply.
+	port_id		reply_port;		/* port to send the reply to */
+	void		*address;		/* watchpoint address */
+	uint32		type;			/* watchpoint type (see type constants above) */
+	int32		length;			/* number of bytes to watch (typically 1, 2, */
+								/* 4); architecture specific alignment */
+								/* restrictions apply. */
 } debug_nub_set_watchpoint;
 
 typedef struct {
-	status_t	error;			// B_OK, if the watchpoint has been set
-								// successfully
+	status_t	error;			/* B_OK, if the watchpoint has been set */
+								/* successfully */
 } debug_nub_set_watchpoint_reply;
 
-// B_DEBUG_MESSAGE_CLEAR_WATCHPOINT
+/* B_DEBUG_MESSAGE_CLEAR_WATCHPOINT */
 
 typedef struct {
-	void		*address;		// watchpoint address
+	void		*address;		/* watchpoint address */
 } debug_nub_clear_watchpoint;
 
-// B_DEBUG_MESSAGE_SET_SIGNAL_MASKS
+/* B_DEBUG_MESSAGE_SET_SIGNAL_MASKS */
 
 typedef struct {
-	thread_id				thread;				// the thread
-	uint64					ignore_mask;		// the mask for signals the
-												// debugger wishes not to be
-												// notified of
-	uint64					ignore_once_mask;	// the mask for signals the
-												// debugger wishes not to be
-												// notified of when they next
-												// occur
-	debug_signal_mask_op	ignore_op;			// what to do with ignore_mask
-	debug_signal_mask_op	ignore_once_op;		// what to do with
-												// ignore_once_mask
+	thread_id				thread;				/* the thread */
+	uint64					ignore_mask;		/* the mask for signals the */
+												/* debugger wishes not to be */
+												/* notified of */
+	uint64					ignore_once_mask;	/* the mask for signals the */
+												/* debugger wishes not to be */
+												/* notified of when they next */
+												/* occur */
+	debug_signal_mask_op	ignore_op;			/* what to do with ignore_mask */
+	debug_signal_mask_op	ignore_once_op;		/* what to do with */
+												/* ignore_once_mask */
 } debug_nub_set_signal_masks;
 
-// B_DEBUG_MESSAGE_GET_SIGNAL_MASKS
+/* B_DEBUG_MESSAGE_GET_SIGNAL_MASKS */
 
 typedef struct {
-	port_id		reply_port;			// port to send the reply to
-	thread_id	thread;				// the thread
+	port_id		reply_port;			/* port to send the reply to */
+	thread_id	thread;				/* the thread */
 } debug_nub_get_signal_masks;
 
 typedef struct {
-	status_t	error;				// B_OK, if the thread exists
-	uint64		ignore_mask;		// the mask for signals the debugger wishes
-									// not to be notified of
-	uint64		ignore_once_mask;	// the mask for signals the debugger wishes
-									// not to be notified of when they next
-									// occur
+	status_t	error;				/* B_OK, if the thread exists */
+	uint64		ignore_mask;		/* the mask for signals the debugger wishes */
+									/* not to be notified of */
+	uint64		ignore_once_mask;	/* the mask for signals the debugger wishes */
+									/* not to be notified of when they next */
+									/* occur */
 } debug_nub_get_signal_masks_reply;
 
-// B_DEBUG_MESSAGE_SET_SIGNAL_HANDLER
+/* B_DEBUG_MESSAGE_SET_SIGNAL_HANDLER */
 
 typedef struct {
-	thread_id			thread;		// the thread
-	int					signal;		// the signal
-	struct sigaction	handler;	// the new signal handler
+	thread_id			thread;		/* the thread */
+	int					signal;		/* the signal */
+	struct sigaction	handler;	/* the new signal handler */
 } debug_nub_set_signal_handler;
 
-// B_DEBUG_MESSAGE_GET_SIGNAL_HANDLER
+/* B_DEBUG_MESSAGE_GET_SIGNAL_HANDLER */
 
 typedef struct {
-	port_id				reply_port;	// port to send the reply to
-	thread_id			thread;		// the thread
-	int					signal;		// the signal
+	port_id				reply_port;	/* port to send the reply to */
+	thread_id			thread;		/* the thread */
+	int					signal;		/* the signal */
 } debug_nub_get_signal_handler;
 
 typedef struct {
-	status_t			error;		// B_OK, if the thread exists
-	struct sigaction	handler;	// the signal handler
+	status_t			error;		/* B_OK, if the thread exists */
+	struct sigaction	handler;	/* the signal handler */
 } debug_nub_get_signal_handler_reply;
 
-// B_DEBUG_MESSAGE_PREPARE_HANDOVER
+/* B_DEBUG_MESSAGE_PREPARE_HANDOVER */
 
-// no parameters, no reply
+/* no parameters, no reply */
 
-// B_DEBUG_START_PROFILER
+/* B_DEBUG_START_PROFILER */
 
 struct debug_profile_function {
-	addr_t			base;	// function base address
-	size_t			size;	// function size
+	addr_t			base;	/* function base address */
+	size_t			size;	/* function size */
 };
 
 typedef struct {
-	port_id				reply_port;		// port to send the reply to
-	thread_id			thread;			// thread to profile
-	bigtime_t			interval;		// sample interval
-	area_id				sample_area;	// area into which the sample will be
-										// written
-	int32				stack_depth;	// number of return address per hit
+	port_id				reply_port;		/* port to send the reply to */
+	thread_id			thread;			/* thread to profile */
+	bigtime_t			interval;		/* sample interval */
+	area_id				sample_area;	/* area into which the sample will be */
+										/* written */
+	int32				stack_depth;	/* number of return address per hit */
 	bool				variable_stack_depth;
-										// variable number of samples per hit;
-										// cf. debug_profiler_update
+										/* variable number of samples per hit; */
+										/* cf. debug_profiler_update */
 } debug_nub_start_profiler;
 
 typedef struct {
 	status_t			error;
-	int32				image_event;	// number of the last image event
-	bigtime_t			interval;		// actual sample interval (might
-										// differ from the requested one)
+	int32				image_event;	/* number of the last image event */
+	bigtime_t			interval;		/* actual sample interval (might */
+										/* differ from the requested one) */
 } debug_nub_start_profiler_reply;
 
-// B_DEBUG_STOP_PROFILER
+/* B_DEBUG_STOP_PROFILER */
 
 typedef struct {
-	port_id				reply_port;		// port to send the reply to
-	thread_id			thread;			// thread to profile
+	port_id				reply_port;		/* port to send the reply to */
+	thread_id			thread;			/* thread to profile */
 } debug_nub_stop_profiler;
 
-// reply is debug_profiler_update
+/* reply is debug_profiler_update */
 
-// union of all messages structures sent to the debug nub thread
+/* union of all messages structures sent to the debug nub thread */
 typedef union {
 	debug_nub_read_memory			read_memory;
 	debug_nub_write_memory			write_memory;
@@ -422,176 +422,176 @@
 } debug_nub_message_data;
 
 
-// #pragma mark -
-// #pragma mark ----- messages to the debugger -----
+/* #pragma mark - */
+/* #pragma mark ----- messages to the debugger ----- */
 
-// first member of all debugger messages -- not a message by itself
+/* first member of all debugger messages -- not a message by itself */
 typedef struct {
-	thread_id	thread;			// the thread being the event origin
-	team_id		team;			// the thread's team
-	port_id		nub_port;		// port to debug nub for this team (only set
-								// for synchronous messages)
+	thread_id	thread;			/* the thread being the event origin */
+	team_id		team;			/* the thread's team */
+	port_id		nub_port;		/* port to debug nub for this team (only set */
+								/* for synchronous messages) */
 } debug_origin;
 
-// B_DEBUGGER_MESSAGE_THREAD_DEBUGGED
+/* B_DEBUGGER_MESSAGE_THREAD_DEBUGGED */
 
 typedef struct {
 	debug_origin		origin;
 } debug_thread_debugged;
 
-// B_DEBUGGER_MESSAGE_DEBUGGER_CALL
+/* B_DEBUGGER_MESSAGE_DEBUGGER_CALL */
 
 typedef struct {
 	debug_origin		origin;
-	void				*message;	// address of the message passed to
-									// debugger()
+	void				*message;	/* address of the message passed to */
+									/* debugger() */
 } debug_debugger_call;
 
-// B_DEBUGGER_MESSAGE_BREAKPOINT_HIT
+/* B_DEBUGGER_MESSAGE_BREAKPOINT_HIT */
 
 typedef struct {
 	debug_origin		origin;
-	debug_cpu_state		cpu_state;	// cpu state
-	bool				software;	// true, if the is a software breakpoint
-									// (i.e. caused by a respective trap
-									// instruction)
+	debug_cpu_state		cpu_state;	/* cpu state */
+	bool				software;	/* true, if the is a software breakpoint */
+									/* (i.e. caused by a respective trap */
+									/* instruction) */
 } debug_breakpoint_hit;
 
-// B_DEBUGGER_MESSAGE_WATCHPOINT_HIT
+/* B_DEBUGGER_MESSAGE_WATCHPOINT_HIT */
 
 typedef struct {
 	debug_origin		origin;
-	debug_cpu_state		cpu_state;	// cpu state
+	debug_cpu_state		cpu_state;	/* cpu state */
 } debug_watchpoint_hit;
 
-// B_DEBUGGER_MESSAGE_SINGLE_STEP
+/* B_DEBUGGER_MESSAGE_SINGLE_STEP */
 
 typedef struct {
 	debug_origin		origin;
-	debug_cpu_state		cpu_state;	// cpu state
+	debug_cpu_state		cpu_state;	/* cpu state */
 } debug_single_step;
 
-// B_DEBUGGER_MESSAGE_PRE_SYSCALL
+/* B_DEBUGGER_MESSAGE_PRE_SYSCALL */
 
 typedef struct {
 	debug_origin	origin;
-	uint32			syscall;		// the syscall number
-	uint32			args[16];		// syscall arguments
+	uint32			syscall;		/* the syscall number */
+	uint32			args[16];		/* syscall arguments */
 } debug_pre_syscall;
 
-// B_DEBUGGER_MESSAGE_POST_SYSCALL
+/* B_DEBUGGER_MESSAGE_POST_SYSCALL */
 
 typedef struct {
 	debug_origin	origin;
-	bigtime_t		start_time;		// time of syscall start
-	bigtime_t		end_time;		// time of syscall completion
-	uint64			return_value;	// the syscall's return value
-	uint32			syscall;		// the syscall number
-	uint32			args[16];		// syscall arguments
+	bigtime_t		start_time;		/* time of syscall start */
+	bigtime_t		end_time;		/* time of syscall completion */
+	uint64			return_value;	/* the syscall's return value */
+	uint32			syscall;		/* the syscall number */
+	uint32			args[16];		/* syscall arguments */
 } debug_post_syscall;
 
-// B_DEBUGGER_MESSAGE_SIGNAL_RECEIVED
+/* B_DEBUGGER_MESSAGE_SIGNAL_RECEIVED */
 
 typedef struct {
 	debug_origin		origin;
-	int					signal;		// the signal
-	struct sigaction	handler;	// the signal handler
-	bool				deadly;		// true, if handling the signal will kill
-									// the team
+	int					signal;		/* the signal */
+	struct sigaction	handler;	/* the signal handler */
+	bool				deadly;		/* true, if handling the signal will kill */
+									/* the team */
 } debug_signal_received;
 
-// B_DEBUGGER_MESSAGE_EXCEPTION_OCCURRED
+/* B_DEBUGGER_MESSAGE_EXCEPTION_OCCURRED */
 
 typedef struct {
 	debug_origin			origin;
-	debug_exception_type	exception;		// the exception
-	int						signal;			// the signal that will be sent,
-											// when the thread continues
-											// normally
+	debug_exception_type	exception;		/* the exception */
+	int						signal;			/* the signal that will be sent, */
+											/* when the thread continues */
+											/* normally */
 } debug_exception_occurred;
 
-// B_DEBUGGER_MESSAGE_TEAM_CREATED
+/* B_DEBUGGER_MESSAGE_TEAM_CREATED */
 
 typedef struct {
 	debug_origin	origin;
-	team_id			new_team;		// the newly created team
+	team_id			new_team;		/* the newly created team */
 } debug_team_created;
 
-// B_DEBUGGER_MESSAGE_TEAM_DELETED
+/* B_DEBUGGER_MESSAGE_TEAM_DELETED */
 
 typedef struct {
-	debug_origin	origin;			// thread is < 0, team is the deleted team
-									// (asynchronous message)
+	debug_origin	origin;			/* thread is < 0, team is the deleted team */
+									/* (asynchronous message) */
 } debug_team_deleted;
 
-// B_DEBUGGER_MESSAGE_TEAM_EXEC
+/* B_DEBUGGER_MESSAGE_TEAM_EXEC */
 
 typedef struct {
 	debug_origin	origin;
-	int32			image_event;	// number of the image event
+	int32			image_event;	/* number of the image event */
 } debug_team_exec;
 
-// B_DEBUGGER_MESSAGE_THREAD_CREATED
+/* B_DEBUGGER_MESSAGE_THREAD_CREATED */
 
 typedef struct {
-	debug_origin	origin;			// the thread that created the new thread
-	team_id			new_thread;		// the newly created thread
+	debug_origin	origin;			/* the thread that created the new thread */
+	team_id			new_thread;		/* the newly created thread */
 } debug_thread_created;
 
-// B_DEBUGGER_MESSAGE_THREAD_DELETED
+/* B_DEBUGGER_MESSAGE_THREAD_DELETED */
 
 typedef struct {
-	debug_origin	origin;			// the deleted thread (asynchronous message)
+	debug_origin	origin;			/* the deleted thread (asynchronous message) */
 } debug_thread_deleted;
 
-// B_DEBUGGER_MESSAGE_IMAGE_CREATED
+/* B_DEBUGGER_MESSAGE_IMAGE_CREATED */
 
 typedef struct {
 	debug_origin	origin;
-	image_info		info;			// info for the image
-	int32			image_event;	// number of the image event
+	image_info		info;			/* info for the image */
+	int32			image_event;	/* number of the image event */
 } debug_image_created;
 
-// B_DEBUGGER_MESSAGE_IMAGE_DELETED
+/* B_DEBUGGER_MESSAGE_IMAGE_DELETED */
 
 typedef struct {
 	debug_origin	origin;
-	image_info		info;			// info for the image
-	int32			image_event;	// number of the image event
+	image_info		info;			/* info for the image */
+	int32			image_event;	/* number of the image event */
 } debug_image_deleted;
 
-// B_DEBUGGER_MESSAGE_PROFILER_UPDATE
+/* B_DEBUGGER_MESSAGE_PROFILER_UPDATE */
 
 typedef struct {
 	debug_origin		origin;
-	int32				image_event;	// number of the last image event; all
-										// samples were recorded after this
-										// event and before the next one
-	int32				stack_depth;	// number of return addresses per tick
-	int32				sample_count;	// number of samples in the buffer
-	int32				dropped_ticks;	// number of ticks that had been
-										// dropped, since the buffer was full
+	int32				image_event;	/* number of the last image event; all */
+										/* samples were recorded after this */
+										/* event and before the next one */
+	int32				stack_depth;	/* number of return addresses per tick */
+	int32				sample_count;	/* number of samples in the buffer */
+	int32				dropped_ticks;	/* number of ticks that had been */
+										/* dropped, since the buffer was full */
 	bool				variable_stack_depth;
-										// the number of samples per hit is
-										// variable, i.e. the format for the
-										// samples of a hit in the buffer is
-										//   <n> <sample 1> ... <sample n>
-										// instead of
-										//   <sample 1> ... <sample stack_depth>
-	bool				stopped;		// if true, the thread is no longer
-										// being profiled
+										/* the number of samples per hit is */
+										/* variable, i.e. the format for the */
+										/* samples of a hit in the buffer is */
+										/*   <n> <sample 1> ... <sample n> */
+										/* instead of */
+										/*   <sample 1> ... <sample stack_depth> */
+	bool				stopped;		/* if true, the thread is no longer */
+										/* being profiled */
 } debug_profiler_update;
 
-// B_DEBUGGER_MESSAGE_HANDED_OVER
+/* B_DEBUGGER_MESSAGE_HANDED_OVER */
 
 typedef struct {
-	debug_origin	origin;			// thread is < 0, team is the deleted team
-									// (asynchronous message)
-	team_id			debugger;		// the new debugger
-	port_id			debugger_port;	// the port the new debugger uses
+	debug_origin	origin;			/* thread is < 0, team is the deleted team */
+									/* (asynchronous message) */
+	team_id			debugger;		/* the new debugger */
+	port_id			debugger_port;	/* the port the new debugger uses */
 } debug_handed_over;
 
-// union of all messages structures sent to the debugger
+/* union of all messages structures sent to the debugger */
 typedef union {
 	debug_thread_debugged			thread_debugged;
 	debug_debugger_call				debugger_call;
@@ -612,7 +612,7 @@
 	debug_profiler_update			profiler_update;
 	debug_handed_over				handed_over;
 
-	debug_origin					origin;	// for convenience (no real message)
+	debug_origin					origin;	/* for convenience (no real message) */
 } debug_debugger_message_data;
 
 
@@ -623,7 +623,7 @@
 
 
 #ifdef __cplusplus
-}	// extern "C"
+}	/* extern "C" */
 #endif
 
-#endif	// _DEBUGGER_H
+#endif	/* _DEBUGGER_H */
Index: midi/MidiDefs.h
===================================================================
--- midi/MidiDefs.h	(revision 28851)
+++ midi/MidiDefs.h	(working copy)
@@ -5,12 +5,12 @@
 #include <OS.h>
 #include <Errors.h>
 
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
 
 /* System time converted to int milliseconds */
 #define B_NOW  ((uint32)(system_time()/1000))
 
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
 
 /* Synthesizer things */
 
@@ -28,7 +28,7 @@
 } 
 synth_mode;
 
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
 
 /* Need to move these into Errors.h */
 
@@ -42,7 +42,7 @@
 	B_TOO_MANY_SONGS_PLAYING
 };
 
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
 
 #ifndef uchar
 typedef unsigned char uchar;
@@ -115,9 +115,9 @@
  
 const uchar B_TEMPO_CHANGE          = 0x51;
 
-#endif // _MIDI_CONSTANTS_
+#endif /* _MIDI_CONSTANTS_ */
 
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
 
 typedef enum midi_axe 
 {
@@ -299,4 +299,4 @@
 } 
 midi_axe;
 
-#endif // _MIDI_DEFS_H
+#endif /* _MIDI_DEFS_H */
Index: NetKit.h
===================================================================
--- NetKit.h	(revision 28851)
+++ NetKit.h	(working copy)
@@ -13,4 +13,4 @@
 #include <NetBuffer.h>
 #include <NetEndpoint.h>
 
-#endif	// _NET_KIT_H_
+#endif	/* _NET_KIT_H_ */
Index: add-ons/graphics/Accelerant.h
===================================================================
--- add-ons/graphics/Accelerant.h	(revision 28851)
+++ add-ons/graphics/Accelerant.h	(working copy)
@@ -122,7 +122,7 @@
 	uint16	v_blank_max;
 } display_timing_constraints;
 
-// TODO: experimental API
+/* TODO: experimental API */
 typedef struct {
 	uint32	version;
 	char	vendor[128];
@@ -135,11 +135,11 @@
 	}		produced;
 	float	width;
 	float	height;
-	uint32	min_horizontal_frequency;	// in kHz
+	uint32	min_horizontal_frequency;	/* in kHz */
 	uint32	max_horizontal_frequency;
-	uint32	min_vertical_frequency;		// in Hz
+	uint32	min_vertical_frequency;		/* in Hz */
 	uint32	max_vertical_frequency;
-	uint32	max_pixel_clock;			// in kHz
+	uint32	max_pixel_clock;			/* in kHz */
 } monitor_info;
 
 enum { /* mode flags */
Index: translation/TranslationDefs.h
===================================================================
--- translation/TranslationDefs.h	(revision 28851)
+++ translation/TranslationDefs.h	(working copy)
@@ -54,13 +54,13 @@
 	char			MIME[251];
 };
 
-// BEGIN: Haiku R1 Extensions
+/* BEGIN: Haiku R1 Extensions */
 
 #define B_TRANSLATION_MAKE_VERSION(major,minor,revision) ((major << 8) | ((minor << 4) & 0xf0) | (revision & 0x0f))
 #define B_TRANSLATION_MAJOR_VERSION(v) (v >> 8)
 #define B_TRANSLATION_MINOR_VERSION(v) ((v >> 4) & 0xf)
 #define B_TRANSLATION_REVISION_VERSION(v) (v & 0xf)
 
-// END: Haiku R1 Extensions
+/* END: Haiku R1 Extensions */
 
 #endif /* _TRANSLATION_DEFS_H */
Index: device/scsi_bus_raw_driver.h
===================================================================
--- device/scsi_bus_raw_driver.h	(revision 28851)
+++ device/scsi_bus_raw_driver.h	(working copy)
@@ -18,9 +18,9 @@
 
 #include <Drivers.h>
 
-// we start with +300 to not collide with any other SCSI opcode defined
-// in scsiprobe_driver.h or scsi.h;
-// all ioctl calls return the subsystem status (see SCSI.h)
+/* we start with +300 to not collide with any other SCSI opcode defined */
+/* in scsiprobe_driver.h or scsi.h; */
+/* all ioctl calls return the subsystem status (see SCSI.h) */
 enum {
 	B_SCSI_BUS_RAW_RESET = B_DEVICE_OP_CODES_END + 300,
 	B_SCSI_BUS_RAW_PATH_INQUIRY
Index: midi2/Midi2Defs.h
===================================================================
--- midi2/Midi2Defs.h	(revision 28851)
+++ midi2/Midi2Defs.h	(working copy)
@@ -71,6 +71,6 @@
 const uchar B_MONO_MODE_ON          = 0x7e;
 const uchar B_POLY_MODE_ON          = 0x7f;
 
-#endif // _MIDI_CONSTANTS_
+#endif /* _MIDI_CONSTANTS_ */
 
-#endif // _MIDI2_DEFS_H
+#endif /* _MIDI2_DEFS_H */
Index: storage/StorageDefs.h
===================================================================
--- storage/StorageDefs.h	(revision 28851)
+++ storage/StorageDefs.h	(working copy)
@@ -11,7 +11,7 @@
 #include <limits.h>
 
 
-// Limits
+/* Limits */
 #define B_DEV_NAME_LENGTH		128
 #define B_FILE_NAME_LENGTH		NAME_MAX
 #define B_PATH_NAME_LENGTH 		MAXPATHLEN
@@ -19,17 +19,17 @@
 #define B_MIME_TYPE_LENGTH		(B_ATTR_NAME_LENGTH - 15)
 #define B_MAX_SYMLINKS			SYMLOOP_MAX
 
-// Open Modes
-#define B_READ_ONLY 		O_RDONLY	// read only 
-#define B_WRITE_ONLY 		O_WRONLY 	// write only 
-#define B_READ_WRITE		O_RDWR   	// read and write
+/* Open Modes */
+#define B_READ_ONLY 		O_RDONLY	/* read only  */
+#define B_WRITE_ONLY 		O_WRONLY 	/* write only  */
+#define B_READ_WRITE		O_RDWR   	/* read and write */
 
-#define	B_FAIL_IF_EXISTS	O_EXCL		// exclusive create 
-#define B_CREATE_FILE		O_CREAT		// create the file 
-#define B_ERASE_FILE		O_TRUNC		// erase the file's data 
-#define B_OPEN_AT_END	   	O_APPEND	// point to the end of the data 
+#define	B_FAIL_IF_EXISTS	O_EXCL		/* exclusive create  */
+#define B_CREATE_FILE		O_CREAT		/* create the file  */
+#define B_ERASE_FILE		O_TRUNC		/* erase the file's data  */
+#define B_OPEN_AT_END	   	O_APPEND	/* point to the end of the data  */
 
-// Node Flavors
+/* Node Flavors */
 enum node_flavor {
   B_FILE_NODE		= 0x01,
   B_SYMLINK_NODE	= 0x02,
@@ -37,4 +37,4 @@
   B_ANY_NODE		= 0x07
 };
 
-#endif // _DEF_STORAGE_H
+#endif /* _DEF_STORAGE_H */
Index: storage/DiskDeviceDefs.h
===================================================================
--- storage/DiskDeviceDefs.h	(revision 28851)
+++ storage/DiskDeviceDefs.h	(working copy)
@@ -13,27 +13,27 @@
 typedef int32 disk_system_id;
 typedef int32 disk_job_id;
 
-// partition flags
+/* partition flags */
 enum {
 	B_PARTITION_IS_DEVICE			= 0x01,
 	B_PARTITION_FILE_SYSTEM			= 0x02,
 	B_PARTITION_PARTITIONING_SYSTEM	= 0x04,
 	B_PARTITION_READ_ONLY			= 0x08,
-	B_PARTITION_MOUNTED				= 0x10,	// needed?
+	B_PARTITION_MOUNTED				= 0x10,	/* needed? */
 	B_PARTITION_BUSY				= 0x20,
 };
 
-// partition statuses
+/* partition statuses */
 enum {
 	B_PARTITION_VALID,
 	B_PARTITION_CORRUPT,
 	B_PARTITION_UNRECOGNIZED,
-	B_PARTITION_UNINITIALIZED,	// Only when uninitialized manually.
-								// When not recognized while scanning it's
-								// B_PARTITION_UNRECOGNIZED.
+	B_PARTITION_UNINITIALIZED,	/* Only when uninitialized manually. */
+								/* When not recognized while scanning it's */
+								/* B_PARTITION_UNRECOGNIZED. */
 };
 
-// partition change flags
+/* partition change flags */
 enum {
 	B_PARTITION_CHANGED_OFFSET				= 0x000001,
 	B_PARTITION_CHANGED_SIZE				= 0x000002,
@@ -56,7 +56,7 @@
 	B_PARTITION_CHANGED_INITIALIZATION		= 0x040000,
 };
 
-// disk device flags
+/* disk device flags */
 enum {
 	B_DISK_DEVICE_REMOVABLE		= 0x01,
 	B_DISK_DEVICE_HAS_MEDIA		= 0x02,
@@ -65,11 +65,11 @@
 	B_DISK_DEVICE_IS_FILE		= 0x10,
 };
 
-// disk system flags
+/* disk system flags */
 enum {
 	B_DISK_SYSTEM_IS_FILE_SYSTEM								= 0x000001,
 
-	// flags common for both file and partitioning systems
+	/* flags common for both file and partitioning systems */
 	B_DISK_SYSTEM_SUPPORTS_CHECKING								= 0x000002,
 	B_DISK_SYSTEM_SUPPORTS_REPAIRING							= 0x000004,
 	B_DISK_SYSTEM_SUPPORTS_RESIZING								= 0x000008,
@@ -79,7 +79,7 @@
 	B_DISK_SYSTEM_SUPPORTS_INITIALIZING							= 0x000080,
 	B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME							= 0x000100,
 
-	// file system specific flags
+	/* file system specific flags */
 	B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING						= 0x001000,
 	B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING_WHILE_MOUNTED			= 0x002000,
 	B_DISK_SYSTEM_SUPPORTS_CHECKING_WHILE_MOUNTED				= 0x004000,
@@ -90,7 +90,7 @@
 	B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS_WHILE_MOUNTED	= 0x080000,
 	B_DISK_SYSTEM_SUPPORTS_WRITING								= 0x100000,
 
-	// partitioning system specific flags
+	/* partitioning system specific flags */
 	B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD						= 0x001000,
 	B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD							= 0x002000,
 	B_DISK_SYSTEM_SUPPORTS_SETTING_NAME							= 0x004000,
@@ -101,7 +101,7 @@
 	B_DISK_SYSTEM_SUPPORTS_NAME									= 0x080000,
 };
 
-// disk device job types
+/* disk device job types */
 enum {
 	B_DISK_DEVICE_JOB_BAD_TYPE,
 	B_DISK_DEVICE_JOB_DEFRAGMENT,
@@ -120,7 +120,7 @@
 	B_DISK_DEVICE_JOB_SCAN,
 };
 
-// disk device job statuses
+/* disk device job statuses */
 enum {
 	B_DISK_DEVICE_JOB_UNINITIALIZED,
 	B_DISK_DEVICE_JOB_SCHEDULED,
@@ -130,7 +130,7 @@
 	B_DISK_DEVICE_JOB_CANCELED,
 };
 
-// disk device job progress info
+/* disk device job progress info */
 typedef struct disk_device_job_progress_info {
 	uint32	status;
 	uint32	interrupt_properties;
@@ -140,7 +140,7 @@
 	char	current_task_description[256];
 } disk_device_job_progress_info;
 
-// disk device job interrupt properties
+/* disk device job interrupt properties */
 enum {
 	B_DISK_DEVICE_JOB_CAN_CANCEL			= 0x01,
 	B_DISK_DEVICE_JOB_STOP_ON_CANCEL		= 0x02,
@@ -148,12 +148,12 @@
 	B_DISK_DEVICE_JOB_CAN_PAUSE				= 0x08,
 };
 
-// string length constants, all of which include the NULL terminator
+/* string length constants, all of which include the NULL terminator */
 #define B_DISK_DEVICE_TYPE_LENGTH B_FILE_NAME_LENGTH
 #define B_DISK_DEVICE_NAME_LENGTH B_FILE_NAME_LENGTH
 #define B_DISK_SYSTEM_NAME_LENGTH B_PATH_NAME_LENGTH
 
-// max size of parameter string buffers, including NULL terminator
+/* max size of parameter string buffers, including NULL terminator */
 #define B_DISK_DEVICE_MAX_PARAMETER_SIZE (32 * 1024)
 
-#endif	// _DISK_DEVICE_DEFS_H
+#endif	/* _DISK_DEVICE_DEFS_H */
Index: bluetooth/L2CAP/btL2CAP.h
===================================================================
--- bluetooth/L2CAP/btL2CAP.h	(revision 28851)
+++ bluetooth/L2CAP/btL2CAP.h	(working copy)
@@ -16,4 +16,4 @@
 };
 
 
-#endif // _BTL2CAP_H_
\ No newline at end of file
+#endif /* _BTL2CAP_H_ */
\ No newline at end of file
Index: bluetooth/HCI/btHCI_sco.h
===================================================================
--- bluetooth/HCI/btHCI_sco.h	(revision 28851)
+++ bluetooth/HCI/btHCI_sco.h	(working copy)
@@ -14,4 +14,4 @@
 	uint8	slen;
 } __attribute__((packed));
 
-#endif // _BTHCI_SCO_H_
+#endif /* _BTHCI_SCO_H_ */
Index: bluetooth/HCI/btHCI_module.h
===================================================================
--- bluetooth/HCI/btHCI_module.h	(revision 28851)
+++ bluetooth/HCI/btHCI_module.h	(working copy)
@@ -32,4 +32,4 @@
 } bt_hci_module_info ;
 
 
-#endif // _BTHCI_MODULE_H_
+#endif /* _BTHCI_MODULE_H_ */
Index: bluetooth/HCI/btHCI_transport.h
===================================================================
--- bluetooth/HCI/btHCI_transport.h	(revision 28851)
+++ bluetooth/HCI/btHCI_transport.h	(working copy)
@@ -93,4 +93,4 @@
 #define BLUETOOTH_CONNECTION_PORT "bluetooth connection port"
 #define BLUETOOTH_CONNECTION_SCHED_PORT "bluetooth con sched port"
 
-#endif // _BTHCI_TRANSPORT_H_
+#endif /* _BTHCI_TRANSPORT_H_ */
Index: bluetooth/HCI/btHCI_acl.h
===================================================================
--- bluetooth/HCI/btHCI_acl.h	(revision 28851)
+++ bluetooth/HCI/btHCI_acl.h	(working copy)
@@ -33,4 +33,4 @@
 #define HCI_ACL_BROADCAST_PICONET	0x2 /* both directions */
 										/* 11 - reserved for future use */
 
-#endif // _BTHCI_ACL_H_
+#endif /* _BTHCI_ACL_H_ */
Index: bluetooth/bluetooth_error.h
===================================================================
--- bluetooth/bluetooth_error.h	(revision 28851)
+++ bluetooth/bluetooth_error.h	(working copy)
@@ -68,4 +68,4 @@
 #define HOST_BUSY_PAIRING					0x38
 
 
-#endif // _BLUETOOTH_ERROR_H
+#endif /* _BLUETOOTH_ERROR_H */
Index: bluetooth/bluetooth_util.h
===================================================================
--- bluetooth/bluetooth_util.h	(revision 28851)
+++ bluetooth/bluetooth_util.h	(working copy)
@@ -53,4 +53,4 @@
 }
 
 
-#endif // _BLUETOOTH_UTIL_H
+#endif /* _BLUETOOTH_UTIL_H */
Index: bluetooth/bluetooth.h
===================================================================
--- bluetooth/bluetooth.h	(revision 28851)
+++ bluetooth/bluetooth.h	(working copy)
@@ -52,4 +52,4 @@
 #define BLUETOOTH_PROTO_MAX		256
 
 
-#endif // _BLUETOOTH_H
+#endif /* _BLUETOOTH_H */
Index: game/GameSoundDefs.h
===================================================================
--- game/GameSoundDefs.h	(revision 28851)
+++ game/GameSoundDefs.h	(working copy)
@@ -1,28 +1,28 @@
-//------------------------------------------------------------------------------
-//	Copyright (c) 2001-2002, OpenBeOS
-//
-//	Permission is hereby granted, free of charge, to any person obtaining a
-//	copy of this software and associated documentation files (the "Software"),
-//	to deal in the Software without restriction, including without limitation
-//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-//	and/or sell copies of the Software, and to permit persons to whom the
-//	Software is furnished to do so, subject to the following conditions:
-//
-//	The above copyright notice and this permission notice shall be included in
-//	all copies or substantial portions of the Software.
-//
-//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-//	DEALINGS IN THE SOFTWARE.
-//
-//	File Name:		GameSound.cpp
-//	Author:			Christopher ML Zumwalt May (cdzumwalt@dsl-only.net)
-//	Description:	Declarations for game sounds
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
+/*	Copyright (c) 2001-2002, OpenBeOS */
+/* */
+/*	Permission is hereby granted, free of charge, to any person obtaining a */
+/*	copy of this software and associated documentation files (the "Software"), */
+/*	to deal in the Software without restriction, including without limitation */
+/*	the rights to use, copy, modify, merge, publish, distribute, sublicense, */
+/*	and/or sell copies of the Software, and to permit persons to whom the */
+/*	Software is furnished to do so, subject to the following conditions: */
+/* */
+/*	The above copyright notice and this permission notice shall be included in */
+/*	all copies or substantial portions of the Software. */
+/* */
+/*	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR */
+/*	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, */
+/*	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE */
+/*	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER */
+/*	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING */
+/*	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER */
+/*	DEALINGS IN THE SOFTWARE. */
+/* */
+/*	File Name:		GameSound.cpp */
+/*	Author:			Christopher ML Zumwalt May (cdzumwalt@dsl-only.net) */
+/*	Description:	Declarations for game sounds */
+/*------------------------------------------------------------------------------ */
 
 #if !defined(_GAME_SOUND_DEFS_H)
 #define _GAME_SOUND_DEFS_H
@@ -34,14 +34,14 @@
 #define B_GS_CUR_API_VERSION B_BEOS_VERSION
 #define B_GS_MIN_API_VERSION 0x100
 
-//	invalid sound handle
+/*	invalid sound handle */
 #define B_GS_INVALID_SOUND ((gs_id)-1)
 
-//	gs_id for the main mix buffer
+/*	gs_id for the main mix buffer */
 #define B_GS_MAIN_SOUND ((gs_id)-2)
 
 
-enum	//fixme	renumber to real error messages
+enum	/*fixme	renumber to real error messages */
 {
 	B_GS_BAD_HANDLE = -99999,
 	B_GS_NO_SOUNDS,
@@ -67,26 +67,26 @@
 };
 
 
-//	
+/*	 */
 enum gs_attributes
 {
-	B_GS_NO_ATTRIBUTE = 0,			//	when there is no attribute
-	B_GS_MAIN_GAIN = 1,				//	0 == 0 dB, -6.0 == -6 dB (gs_id ignored)
-	B_GS_CD_THROUGH_GAIN,			//	0 == 0 dB, -12.0 == -12 dB (gs_id ignored)
-										//	but which CD?
-	B_GS_GAIN = 128,				//	0 == 0 dB, -1.0 == -1 dB, +10.0 == +10 dB
-	B_GS_PAN,						//	0 == middle, -1.0 == left, +1.0 == right
-	B_GS_SAMPLING_RATE,				//	44100.0 == 44.1 kHz
-	B_GS_LOOPING,					//	0 == no
+	B_GS_NO_ATTRIBUTE = 0,			/*	when there is no attribute */
+	B_GS_MAIN_GAIN = 1,				/*	0 == 0 dB, -6.0 == -6 dB (gs_id ignored) */
+	B_GS_CD_THROUGH_GAIN,			/*	0 == 0 dB, -12.0 == -12 dB (gs_id ignored) */
+										/*	but which CD? */
+	B_GS_GAIN = 128,				/*	0 == 0 dB, -1.0 == -1 dB, +10.0 == +10 dB */
+	B_GS_PAN,						/*	0 == middle, -1.0 == left, +1.0 == right */
+	B_GS_SAMPLING_RATE,				/*	44100.0 == 44.1 kHz */
+	B_GS_LOOPING,					/*	0 == no */
 	B_GS_FIRST_PRIVATE_ATTRIBUTE = 90000,
 	B_GS_FIRST_USER_ATTRIBUTE = 100000
 };
 struct gs_attribute
 {
-		int32		attribute;		//	which attribute
-		bigtime_t	duration;		//	how long of time to ramp over for the change
-		float		value;			//	where the value stops changing
-		uint32		flags;			//	whatever flags are for the attribute
+		int32		attribute;		/*	which attribute */
+		bigtime_t	duration;		/*	how long of time to ramp over for the change */
+		float		value;			/*	where the value stops changing */
+		uint32		flags;			/*	whatever flags are for the attribute */
 };
 struct gs_attribute_info
 {
@@ -97,4 +97,4 @@
 };
 
 
-#endif	//	_GAME_SOUND_DEFS_H
+#endif	/*	_GAME_SOUND_DEFS_H */
Index: be_apps/ServicesDaemon/ServicesDaemon.h
===================================================================
--- be_apps/ServicesDaemon/ServicesDaemon.h	(revision 28851)
+++ be_apps/ServicesDaemon/ServicesDaemon.h	(working copy)
@@ -3,10 +3,10 @@
 
 #define B_SERVICES_DAEMON_SIGNATURE "application/x-vnd.Haiku-ServicesDaemon"
 
-// Send this message to the daemon if you would like to have your program
-// restarted. The message is expected to have an attached string containing
-// the signature of your app. Once sent to the daemon, it will wait until
-// your app quits before relaunching it.
+/* Send this message to the daemon if you would like to have your program */
+/* restarted. The message is expected to have an attached string containing */
+/* the signature of your app. Once sent to the daemon, it will wait until */
+/* your app quits before relaunching it. */
 #define B_SERVICES_DAEMON_RESTART 'SDRS'
 
 #endif
Index: be_apps/Deskbar/Deskbar.h
===================================================================
--- be_apps/Deskbar/Deskbar.h	(revision 28851)
+++ be_apps/Deskbar/Deskbar.h	(working copy)
@@ -1,6 +1,6 @@
 #ifndef _DESKBAR_H
-//	I don't know why this file exists in addition to the one we include
-//	below, but who cares... (originally, in R5, both files exist and are
-//	identical).
+/*	I don't know why this file exists in addition to the one we include */
+/*	below, but who cares... (originally, in R5, both files exist and are */
+/*	identical). */
 #	include <interface/Deskbar.h>
 #endif
Index: be_apps/Tracker/Background.h
===================================================================
--- be_apps/Tracker/Background.h	(revision 28851)
+++ be_apps/Tracker/Background.h	(working copy)
@@ -43,26 +43,26 @@
 /*----------------------------------------------------------------*/
 /*-----  Tracker background BMessage entries  --------------------*/
 
-#define B_BACKGROUND_IMAGE		"be:bgndimginfopath"		// string path
-#define B_BACKGROUND_MODE		"be:bgndimginfomode"		// int32, the enum below
-#define B_BACKGROUND_ORIGIN		"be:bgndimginfooffset"		// BPoint
-#define B_BACKGROUND_ERASE_TEXT	"be:bgndimginfoerasetext"	// bool
-#define B_BACKGROUND_WORKSPACES	"be:bgndimginfoworkspaces"	// uint32
+#define B_BACKGROUND_IMAGE		"be:bgndimginfopath"		/* string path */
+#define B_BACKGROUND_MODE		"be:bgndimginfomode"		/* int32, the enum below */
+#define B_BACKGROUND_ORIGIN		"be:bgndimginfooffset"		/* BPoint */
+#define B_BACKGROUND_ERASE_TEXT	"be:bgndimginfoerasetext"	/* bool */
+#define B_BACKGROUND_WORKSPACES	"be:bgndimginfoworkspaces"	/* uint32 */
 
 /*----------------------------------------------------------------*/
 /*-----  Background mode values  ---------------------------------*/
 
 enum {
 	B_BACKGROUND_MODE_USE_ORIGIN,
-	B_BACKGROUND_MODE_CENTERED,		// only works on Desktop
-	B_BACKGROUND_MODE_SCALED,		// only works on Desktop
+	B_BACKGROUND_MODE_CENTERED,		/* only works on Desktop */
+	B_BACKGROUND_MODE_SCALED,		/* only works on Desktop */
 	B_BACKGROUND_MODE_TILED
 };
 
 /*----------------------------------------------------------------*/
 /*----------------------------------------------------------------*/
 
-const int32 B_RESTORE_BACKGROUND_IMAGE = 'Tbgr';	// force a Tracker window to
-													// use a new background image
+const int32 B_RESTORE_BACKGROUND_IMAGE = 'Tbgr';	/* force a Tracker window to */
+													/* use a new background image */
 
 #endif /* _TRACKER_BACKGROUND_H */
Index: arch/ppc/arch_debugger.h
===================================================================
--- arch/ppc/arch_debugger.h	(revision 28851)
+++ arch/ppc/arch_debugger.h	(working copy)
@@ -9,4 +9,4 @@
 	uint32	dummy;
 } __attribute__((aligned(8)));
 
-#endif	// _ARCH_PPC_DEBUGGER_H
+#endif	/* _ARCH_PPC_DEBUGGER_H */
Index: arch/m68k/arch_debugger.h
===================================================================
--- arch/m68k/arch_debugger.h	(revision 28851)
+++ arch/m68k/arch_debugger.h	(working copy)
@@ -28,4 +28,4 @@
 	uint32	dummy;
 } __attribute__((aligned(8)));
 
-#endif	// _ARCH_M68K_DEBUGGER_H
+#endif	/* _ARCH_M68K_DEBUGGER_H */
Index: arch/x86/arch_debugger.h
===================================================================
--- arch/x86/arch_debugger.h	(revision 28851)
+++ arch/x86/arch_debugger.h	(working copy)
@@ -29,4 +29,4 @@
 	uint32	user_ss;
 } __attribute__((aligned(8)));
 
-#endif	// _ARCH_X86_DEBUGGER_H
+#endif	/* _ARCH_X86_DEBUGGER_H */
Index: mail/mail_encoding.h
===================================================================
--- mail/mail_encoding.h	(revision 28851)
+++ mail/mail_encoding.h	(working copy)
@@ -12,10 +12,10 @@
 
 #define B_MAIL_NULL_CONVERSION ((uint32) -1)
 #define B_MAIL_UTF8_CONVERSION ((uint32) -2)
-// For specifying the UTF-8 character set when converting to/from UTF-8.
+/* For specifying the UTF-8 character set when converting to/from UTF-8. */
 #define B_MAIL_US_ASCII_CONVERSION ((uint32) -3)
-// Plain 7 bit ASCII character set.  A subset of UTF-8, but some mail software
-// specifies it so we need to recognize it.
+/* Plain 7 bit ASCII character set.  A subset of UTF-8, but some mail software */
+/* specifies it so we need to recognize it. */
 
 #define BASE64_LINELENGTH 76
 
@@ -24,8 +24,8 @@
 	quoted_printable 	= 'q',
 	seven_bit			= '7',
 	eight_bit			= '8',
-	uuencode			= 'u', // Invalid to encode something using uuencode.
-	null_encoding		= 0,   // For not changing existing settings.
+	uuencode			= 'u', /* Invalid to encode something using uuencode. */
+	null_encoding		= 0,   /* For not changing existing settings. */
 	no_encoding			= -1
 } mail_encoding;
 
@@ -35,10 +35,10 @@
 
 ssize_t encode(mail_encoding encoding, char *out, const char *in,
 	off_t length, int headerMode);
-	// boolean headerMode only matters for quoted_printable and base64.
+	/* boolean headerMode only matters for quoted_printable and base64. */
 ssize_t decode(mail_encoding encoding, char *out, const char *in, off_t length,
 	int underscore_is_space);
-	// the value of underscore_is_space only matters for quoted_printable.
+	/* the value of underscore_is_space only matters for quoted_printable. */
 
 ssize_t max_encoded_length(mail_encoding encoding, off_t cur_length);
 mail_encoding encoding_for_cte(const char *content_transfer_encoding);
@@ -48,7 +48,7 @@
 
 ssize_t	encode_qp(char *out, const char *in, off_t length, int headerMode);
 ssize_t	decode_qp(char *out, const char *in, off_t length, int underscore_is_space);
-	//---underscore_is_space should be 1 if and only if you are decoding a header field
+	/*---underscore_is_space should be 1 if and only if you are decoding a header field */
 
 ssize_t	uu_decode(char *out, const char *in, off_t length);
 
Index: interface/UnicodeBlockObjects.h
===================================================================
--- interface/UnicodeBlockObjects.h	(revision 28851)
+++ interface/UnicodeBlockObjects.h	(working copy)
@@ -1,47 +1,47 @@
-//------------------------------------------------------------------------------
-//	Copyright (c) 2001-2002, OpenBeOS
-//
-//	Permission is hereby granted, free of charge, to any person obtaining a
-//	copy of this software and associated documentation files (the "Software"),
-//	to deal in the Software without restriction, including without limitation
-//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-//	and/or sell copies of the Software, and to permit persons to whom the
-//	Software is furnished to do so, subject to the following conditions:
-//
-//	The above copyright notice and this permission notice shall be included in
-//	all copies or substantial portions of the Software.
-//
-//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-//	DEALINGS IN THE SOFTWARE.
-//
-//	File Name:		UnicodeBlockObjects.h
-//	Author:			Erik Jaesler (erik@cgsoftware.com)
-//	Description:	Predefined unicode_block objects
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
+/*	Copyright (c) 2001-2002, OpenBeOS */
+/* */
+/*	Permission is hereby granted, free of charge, to any person obtaining a */
+/*	copy of this software and associated documentation files (the "Software"), */
+/*	to deal in the Software without restriction, including without limitation */
+/*	the rights to use, copy, modify, merge, publish, distribute, sublicense, */
+/*	and/or sell copies of the Software, and to permit persons to whom the */
+/*	Software is furnished to do so, subject to the following conditions: */
+/* */
+/*	The above copyright notice and this permission notice shall be included in */
+/*	all copies or substantial portions of the Software. */
+/* */
+/*	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR */
+/*	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, */
+/*	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE */
+/*	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER */
+/*	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING */
+/*	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER */
+/*	DEALINGS IN THE SOFTWARE. */
+/* */
+/*	File Name:		UnicodeBlockObjects.h */
+/*	Author:			Erik Jaesler (erik@cgsoftware.com) */
+/*	Description:	Predefined unicode_block objects */
+/*------------------------------------------------------------------------------ */
 
 #ifndef _UNICODEBLOCKOBJECTS_H
 #define _UNICODEBLOCKOBJECTS_H
 
-// Standard Includes -----------------------------------------------------------
+/* Standard Includes ----------------------------------------------------------- */
 
-// System Includes -------------------------------------------------------------
+/* System Includes ------------------------------------------------------------- */
 #include <Font.h>
 
-// Project Includes ------------------------------------------------------------
+/* Project Includes ------------------------------------------------------------ */
 
-// Local Includes --------------------------------------------------------------
+/* Local Includes -------------------------------------------------------------- */
 
-// Local Defines ---------------------------------------------------------------
+/* Local Defines --------------------------------------------------------------- */
 
-// Globals ---------------------------------------------------------------------
+/* Globals --------------------------------------------------------------------- */
 
 
-// Unicode block list with their unicode encoding range
+/* Unicode block list with their unicode encoding range */
 const unicode_block B_BASIC_LATIN_BLOCK(					/* 0000 - 007F			*/				0x0000000000000000LL, 0x0000000000000001LL);			
 const unicode_block B_LATIN1_SUPPLEMENT_BLOCK(				/* 0080 - 00FF			*/				0x0000000000000000LL, 0x0000000000000002LL);			
 const unicode_block B_LATIN_EXTENDED_A_BLOCK(				/* 0100 - 017F			*/				0x0000000000000000LL, 0x0000000000000004LL);			
@@ -114,7 +114,7 @@
 const unicode_block B_SPECIALS_BLOCK(						/* FEFF and FFF0 - FFFF	*/				0x0000000000000020LL, 0x0000000000000000LL);			
 const unicode_block B_TIBETAN_BLOCK(						/* 0F00 - 0FBF			*/				0x0000000000000040LL, 0x0000000000000000LL);			
 
-#endif	// _UNICODEBLOCKOBJECTS_H
+#endif	/* _UNICODEBLOCKOBJECTS_H */
 
 /*
  * $Log $
Index: interface/GraphicsDefs.h
===================================================================
--- interface/GraphicsDefs.h	(revision 28851)
+++ interface/GraphicsDefs.h	(working copy)
@@ -10,7 +10,7 @@
 #include <SupportDefs.h>
 
 
-// Pattern
+/* Pattern */
 
 typedef struct pattern {
 	uint8 data[8];
@@ -30,14 +30,14 @@
 	return !(a == b);
 }
 
-#endif // __cplusplus
+#endif /* __cplusplus */
 
 extern const pattern B_SOLID_HIGH;
 extern const pattern B_MIXED_COLORS;
 extern const pattern B_SOLID_LOW;
 
 
-// rgb_color
+/* rgb_color */
 
 typedef struct rgb_color {
 	uint8		red;
@@ -46,7 +46,7 @@
 	uint8		alpha;
 
 #if defined(__cplusplus)
-	// some convenient additions
+	/* some convenient additions */
 
 	inline rgb_color&
 	set_to(uint8 r, uint8 g, uint8 b, uint8 a = 255)
@@ -98,7 +98,7 @@
 extern const rgb_color	B_TRANSPARENT_32_BIT;
 
 
-// color map
+/* color map */
 
 typedef struct color_map {
 	int32				id;
@@ -108,7 +108,7 @@
 } color_map;
 
 
-// overlay
+/* overlay */
 
 typedef struct overlay_rect_limits {
 	uint16				horizontal_alignment;
@@ -133,22 +133,22 @@
 } overlay_restrictions;
 
 
-// screen ID
+/* screen ID */
 
 struct screen_id { int32 id; };
 
 extern const struct screen_id B_MAIN_SCREEN_ID;
 
 
-// color spaces
+/* color spaces */
 
 typedef enum {
 	B_NO_COLOR_SPACE	= 0x0000,
 
-	// linear color space (little endian)
-	B_RGB32				= 0x0008,	// BGR-
-	B_RGBA32			= 0x2008,	// BGRA
-	B_RGB24				= 0x0003,	// BGR
+	/* linear color space (little endian) */
+	B_RGB32				= 0x0008,	/* BGR- */
+	B_RGBA32			= 0x2008,	/* BGRA */
+	B_RGB24				= 0x0003,	/* BGR */
 	B_RGB16				= 0x0005,
 	B_RGB15				= 0x0010,
 	B_RGBA15			= 0x2010,
@@ -156,15 +156,15 @@
 	B_GRAY8				= 0x0002,
 	B_GRAY1				= 0x0001,
 
-	// big endian version
-	B_RGB32_BIG			= 0x1008,	// -RGB
-	B_RGBA32_BIG		= 0x3008,	// ARGB
-	B_RGB24_BIG			= 0x1003,	// RGB
+	/* big endian version */
+	B_RGB32_BIG			= 0x1008,	/* -RGB */
+	B_RGBA32_BIG		= 0x3008,	/* ARGB */
+	B_RGB24_BIG			= 0x1003,	/* RGB */
 	B_RGB16_BIG			= 0x1005,
 	B_RGB15_BIG			= 0x1010,
 	B_RGBA15_BIG		= 0x3010,
 
-	// explicit little-endian for completeness
+	/* explicit little-endian for completeness */
 	B_RGB32_LITTLE		= B_RGB32,
 	B_RGBA32_LITTLE		= B_RGBA32,
 	B_RGB24_LITTLE		= B_RGB24,
@@ -172,67 +172,67 @@
 	B_RGB15_LITTLE		= B_RGB15,
 	B_RGBA15_LITTLE		= B_RGBA15,
 
-	// non linear color space -- incidently, all with 8 bits per value
-	// Note, BBitmap and BView do not support all of these!
+	/* non linear color space -- incidently, all with 8 bits per value */
+	/* Note, BBitmap and BView do not support all of these! */
 
-	// loss/saturation points are Y 16-235 (absolute), Cb/Cr 16-240 (center 128)
+	/* loss/saturation points are Y 16-235 (absolute), Cb/Cr 16-240 (center 128) */
 
-	B_YCbCr422			= 0x4000,	// Y0  Cb0  Y1  Cr0  Y2...
-									// Cb2 Y3  Cr2...
-	B_YCbCr411			= 0x4001,	// Cb0 Y0  Cr0  Y1  Cb4...
-									// Y2  Cr4 Y3   Y4  Y5...
-									// Y6  Y7...
-	B_YCbCr444			= 0x4003,	// Y Cb Cr
-	B_YCbCr420			= 0x4004,	// Non-interlaced only
-		// on even scan lines: Cb0  Y0  Y1  Cb2 Y2  Y3
-		// on odd scan lines:  Cr0  Y0  Y1  Cr2 Y2  Y3
+	B_YCbCr422			= 0x4000,	/* Y0  Cb0  Y1  Cr0  Y2... */
+									/* Cb2 Y3  Cr2... */
+	B_YCbCr411			= 0x4001,	/* Cb0 Y0  Cr0  Y1  Cb4... */
+									/* Y2  Cr4 Y3   Y4  Y5... */
+									/* Y6  Y7... */
+	B_YCbCr444			= 0x4003,	/* Y Cb Cr */
+	B_YCbCr420			= 0x4004,	/* Non-interlaced only */
+		/* on even scan lines: Cb0  Y0  Y1  Cb2 Y2  Y3 */
+		/* on odd scan lines:  Cr0  Y0  Y1  Cr2 Y2  Y3 */
 
-	// Extrema points are:
-	//  Y 0 - 207 (absolute)
-	//  U -91 - 91 (offset 128)
-	//  V -127 - 127 (offset 128)
+	/* Extrema points are: */
+	/*  Y 0 - 207 (absolute) */
+	/*  U -91 - 91 (offset 128) */
+	/*  V -127 - 127 (offset 128) */
 
-	// Note that YUV byte order is different from YCbCr; use YCbCr, not YUV,
-	// when that's what you mean!
-	B_YUV422			= 0x4020,	// U0  Y0  V0  Y1...
-									// U2  Y2  V2  Y3...
-	B_YUV411			= 0x4021,	// U0  Y0  Y1  V0  Y2  Y3...
-									// U4  Y4  Y5  V4  Y6  Y7...
-	B_YUV444			= 0x4023,	// U0  Y0  V0  U1  Y1  V1
-	B_YUV420			= 0x4024,	// Non-interlaced only
-		// on even scan lines: U0  Y0  Y1  U2 Y2  Y3
-		// on odd scan lines:  V0  Y0  Y1  V2 Y2  Y3
+	/* Note that YUV byte order is different from YCbCr; use YCbCr, not YUV, */
+	/* when that's what you mean! */
+	B_YUV422			= 0x4020,	/* U0  Y0  V0  Y1... */
+									/* U2  Y2  V2  Y3... */
+	B_YUV411			= 0x4021,	/* U0  Y0  Y1  V0  Y2  Y3... */
+									/* U4  Y4  Y5  V4  Y6  Y7... */
+	B_YUV444			= 0x4023,	/* U0  Y0  V0  U1  Y1  V1 */
+	B_YUV420			= 0x4024,	/* Non-interlaced only */
+		/* on even scan lines: U0  Y0  Y1  U2 Y2  Y3 */
+		/* on odd scan lines:  V0  Y0  Y1  V2 Y2  Y3 */
 	B_YUV9				= 0x402C,
 	B_YUV12				= 0x402D,
 
-	B_UVL24				= 0x4030,	// UVL
-	B_UVL32				= 0x4031,	// UVL-
-	B_UVLA32			= 0x6031,	// UVLA
+	B_UVL24				= 0x4030,	/* UVL */
+	B_UVL32				= 0x4031,	/* UVL- */
+	B_UVLA32			= 0x6031,	/* UVLA */
 
-	// L lightness, a/b color-opponent dimensions
-	B_LAB24				= 0x4032,	// Lab
-	B_LAB32				= 0x4033,	// Lab-
-	B_LABA32			= 0x6033,	// LabA
+	/* L lightness, a/b color-opponent dimensions */
+	B_LAB24				= 0x4032,	/* Lab */
+	B_LAB32				= 0x4033,	/* Lab- */
+	B_LABA32			= 0x6033,	/* LabA */
 
-	// Red is at hue 0
-	B_HSI24				= 0x4040,	// HSI
-	B_HSI32				= 0x4041,	// HSI-
-	B_HSIA32			= 0x6041,	// HSIA
+	/* Red is at hue 0 */
+	B_HSI24				= 0x4040,	/* HSI */
+	B_HSI32				= 0x4041,	/* HSI- */
+	B_HSIA32			= 0x6041,	/* HSIA */
 
-	B_HSV24				= 0x4042,	// HSV
-	B_HSV32				= 0x4043,	// HSV-
-	B_HSVA32			= 0x6043,	// HSVA
+	B_HSV24				= 0x4042,	/* HSV */
+	B_HSV32				= 0x4043,	/* HSV- */
+	B_HSVA32			= 0x6043,	/* HSVA */
 
-	B_HLS24				= 0x4044,	// HLS
-	B_HLS32				= 0x4045,	// HLS-
-	B_HLSA32			= 0x6045,	// HLSA
+	B_HLS24				= 0x4044,	/* HLS */
+	B_HLS32				= 0x4045,	/* HLS- */
+	B_HLSA32			= 0x6045,	/* HLSA */
 
-	B_CMY24				= 0xC001,	// CMY
-	B_CMY32				= 0xC002,	// CMY-
-	B_CMYA32			= 0xE002,	// CMYA
-	B_CMYK32			= 0xC003,	// CMYK
+	B_CMY24				= 0xC001,	/* CMY */
+	B_CMY32				= 0xC002,	/* CMY- */
+	B_CMYA32			= 0xE002,	/* CMYA */
+	B_CMYK32			= 0xC003,	/* CMYK */
 
-	// compatibility declarations
+	/* compatibility declarations */
 	B_MONOCHROME_1_BIT	= B_GRAY1,
 	B_GRAYSCALE_8_BIT	= B_GRAY8,
 	B_COLOR_8_BIT		= B_CMAP8,
@@ -243,7 +243,7 @@
 } color_space;
 
 
-// Bitmap Support Flags
+/* Bitmap Support Flags */
 
 enum {
 	B_VIEWS_SUPPORT_DRAW_BITMAP			= 0x1,
@@ -266,7 +266,7 @@
 };
 
 		      
-// Drawing Modes
+/* Drawing Modes */
 
 enum drawing_mode {
 	B_OP_COPY,
@@ -293,7 +293,7 @@
 };
 
 
-// Fixed Screen Modes
+/* Fixed Screen Modes */
 
 enum {
 	B_8_BIT_640x480		= 0x00000001,
@@ -324,4 +324,4 @@
 	B_8_BIT_640x400		= 0x80000000
 };
 
-#endif	// _GRAPHICS_DEFS_H
+#endif	/* _GRAPHICS_DEFS_H */
Index: support/parsedate.h
===================================================================
--- support/parsedate.h	(revision 28851)
+++ support/parsedate.h	(working copy)
@@ -11,7 +11,7 @@
 
 /* flags that will be set in the flags field by parsedate_etc() */
 #define PARSEDATE_RELATIVE_TIME			0x0001
-// ToDo: the following flags are not part of the R5 implementation and preliminary only
+/* ToDo: the following flags are not part of the R5 implementation and preliminary only */
 #define PARSEDATE_DAY_RELATIVE_TIME		PARSEDATE_RELATIVE_TIME
 #define PARSEDATE_MINUTE_RELATIVE_TIME	0x0002
 #define PARSEDATE_INVALID_DATE			0x0100
Index: support/Beep.h
===================================================================
--- support/Beep.h	(revision 28851)
+++ support/Beep.h	(working copy)
@@ -11,7 +11,7 @@
 
 
 #ifdef __cplusplus
-// These functions are only exported for C++
+/* These functions are only exported for C++ */
 
 status_t beep();
 status_t system_beep(const char* eventName);
@@ -19,4 +19,4 @@
 
 #endif
 
-#endif	// _BEEP_H
+#endif	/* _BEEP_H */
Index: support/TypeConstants.h
===================================================================
--- support/TypeConstants.h	(revision 28851)
+++ support/TypeConstants.h	(working copy)
@@ -56,23 +56,23 @@
 	B_UINT8_TYPE					= 'UBYT',
 	B_VECTOR_ICON_TYPE				= 'VICN',
 
-	// deprecated, do not use
-	B_ASCII_TYPE					= 'TEXT'	// use B_STRING_TYPE instead
+	/* deprecated, do not use */
+	B_ASCII_TYPE					= 'TEXT'	/* use B_STRING_TYPE instead */
 };
 
-// System-wide MIME types for handling URL's
+/* System-wide MIME types for handling URL's */
 
-extern const char *B_URL_HTTP; 		// application/x-vnd.Be.URL.http
-extern const char *B_URL_HTTPS; 		// application/x-vnd.Be.URL.https
-extern const char *B_URL_FTP;		// application/x-vnd.Be.URL.ftp
-extern const char *B_URL_GOPHER; 	// application/x-vnd.Be.URL.gopher
-extern const char *B_URL_MAILTO; 	// application/x-vnd.Be.URL.mailto
-extern const char *B_URL_NEWS;		// application/x-vnd.Be.URL.news
-extern const char *B_URL_NNTP;		// application/x-vnd.Be.URL.nntp
-extern const char *B_URL_TELNET; 	// application/x-vnd.Be.URL.telnet
-extern const char *B_URL_RLOGIN; 	// application/x-vnd.Be.URL.rlogin
-extern const char *B_URL_TN3270; 	// application/x-vnd.Be.URL.tn3270
-extern const char *B_URL_WAIS;		// application/x-vnd.Be.URL.wais
-extern const char *B_URL_FILE;		// application/x-vnd.Be.URL.file
+extern const char *B_URL_HTTP; 		/* application/x-vnd.Be.URL.http */
+extern const char *B_URL_HTTPS; 		/* application/x-vnd.Be.URL.https */
+extern const char *B_URL_FTP;		/* application/x-vnd.Be.URL.ftp */
+extern const char *B_URL_GOPHER; 	/* application/x-vnd.Be.URL.gopher */
+extern const char *B_URL_MAILTO; 	/* application/x-vnd.Be.URL.mailto */
+extern const char *B_URL_NEWS;		/* application/x-vnd.Be.URL.news */
+extern const char *B_URL_NNTP;		/* application/x-vnd.Be.URL.nntp */
+extern const char *B_URL_TELNET; 	/* application/x-vnd.Be.URL.telnet */
+extern const char *B_URL_RLOGIN; 	/* application/x-vnd.Be.URL.rlogin */
+extern const char *B_URL_TN3270; 	/* application/x-vnd.Be.URL.tn3270 */
+extern const char *B_URL_WAIS;		/* application/x-vnd.Be.URL.wais */
+extern const char *B_URL_FILE;		/* application/x-vnd.Be.URL.file */
 
-#endif	// _TYPE_CONSTANTS_H
+#endif	/* _TYPE_CONSTANTS_H */
Index: support/UTF8.h
===================================================================
--- support/UTF8.h	(revision 28851)
+++ support/UTF8.h	(working copy)
@@ -11,9 +11,9 @@
 #include <SupportDefs.h>
 
 
-// Conversion Flavors
+/* Conversion Flavors */
 enum {
-	B_ISO1_CONVERSION,				// ISO 8859-x
+	B_ISO1_CONVERSION,				/* ISO 8859-x */
 	B_ISO2_CONVERSION,
 	B_ISO3_CONVERSION,
 	B_ISO4_CONVERSION,
@@ -23,26 +23,26 @@
 	B_ISO8_CONVERSION,
 	B_ISO9_CONVERSION,
 	B_ISO10_CONVERSION,
-	B_MAC_ROMAN_CONVERSION,			// Macintosh Roman
-	B_SJIS_CONVERSION,				// Shift-JIS
-	B_EUC_CONVERSION,				// EUC Packed Japanese
-	B_JIS_CONVERSION,				// JIS X 0208-1990
-	B_MS_WINDOWS_CONVERSION,		// Windows Latin-1 Codepage 1252
-	B_UNICODE_CONVERSION,			// Unicode 2.0, UCS-2
-	B_KOI8R_CONVERSION,				// KOI8-R
-	B_MS_WINDOWS_1251_CONVERSION,	// Windows Cyrillic Codepage 1251
-	B_MS_DOS_866_CONVERSION,		// MS-DOS Codepage 866
-	B_MS_DOS_CONVERSION,			// MS-DOS Codepage 437
-	B_EUC_KR_CONVERSION,			// EUC Korean
+	B_MAC_ROMAN_CONVERSION,			/* Macintosh Roman */
+	B_SJIS_CONVERSION,				/* Shift-JIS */
+	B_EUC_CONVERSION,				/* EUC Packed Japanese */
+	B_JIS_CONVERSION,				/* JIS X 0208-1990 */
+	B_MS_WINDOWS_CONVERSION,		/* Windows Latin-1 Codepage 1252 */
+	B_UNICODE_CONVERSION,			/* Unicode 2.0, UCS-2 */
+	B_KOI8R_CONVERSION,				/* KOI8-R */
+	B_MS_WINDOWS_1251_CONVERSION,	/* Windows Cyrillic Codepage 1251 */
+	B_MS_DOS_866_CONVERSION,		/* MS-DOS Codepage 866 */
+	B_MS_DOS_CONVERSION,			/* MS-DOS Codepage 437 */
+	B_EUC_KR_CONVERSION,			/* EUC Korean */
 	B_ISO13_CONVERSION,
 	B_ISO14_CONVERSION,
 	B_ISO15_CONVERSION,
-	B_BIG5_CONVERSION,				// Chinese Big5
-	B_GBK_CONVERSION,				// Chinese GB18030
+	B_BIG5_CONVERSION,				/* Chinese Big5 */
+	B_GBK_CONVERSION,				/* Chinese GB18030 */
 };
 
 
-// Conversion Functions
+/* Conversion Functions */
 
 #ifdef __cplusplus
 
Index: drivers/locked_pool.h
===================================================================
--- drivers/locked_pool.h	(revision 28851)
+++ drivers/locked_pool.h	(working copy)
@@ -41,23 +41,23 @@
 typedef struct {
 	module_info minfo;
 
-	// allocate block	
+	/* allocate block	 */
 	void *(*alloc)(locked_pool_cookie pool);
-	// free block
+	/* free block */
 	void (*free)(locked_pool_cookie pool, void *block);
 
-	// create new pool
-	// block_size	- size of one memory block
-	// alignment	- set address bits here that must be zero for block addresses
-	// next_ofs		- offset in block where internal next-pointer can be stored
-	// chunk_size	- how much system memory is to be allocated at once
-	// max_blocks	- maximum number of blocks
-	// min_free_block - minimum number of free blocks
-	// name			- name of pool
-	// lock_flags	- flags to be passed to lock_memory()
-	// alloc_hook	- hook to be called when new block is added to pool (can be NULL )
-	// free_hook	- hook to be called when block is removed from pool (can be NULL )
-	// hook_arg		- value to be passed to hooks as arg
+	/* create new pool */
+	/* block_size	- size of one memory block */
+	/* alignment	- set address bits here that must be zero for block addresses */
+	/* next_ofs		- offset in block where internal next-pointer can be stored */
+	/* chunk_size	- how much system memory is to be allocated at once */
+	/* max_blocks	- maximum number of blocks */
+	/* min_free_block - minimum number of free blocks */
+	/* name			- name of pool */
+	/* lock_flags	- flags to be passed to lock_memory() */
+	/* alloc_hook	- hook to be called when new block is added to pool (can be NULL ) */
+	/* free_hook	- hook to be called when block is removed from pool (can be NULL ) */
+	/* hook_arg		- value to be passed to hooks as arg */
 	locked_pool_cookie (*create)(int block_size, int alignment, int next_ofs,
 		int chunk_size, int max_blocks, int min_free_blocks, const char *name,
 		uint32 lock_flags, locked_pool_add_hook add_hook, 
Index: drivers/dpc.h
===================================================================
--- drivers/dpc.h	(revision 28851)
+++ drivers/dpc.h	(working copy)
@@ -30,4 +30,4 @@
 }
 #endif
 
-#endif		// _DPC_MODULE_H_
+#endif		/* _DPC_MODULE_H_ */
Index: drivers/ACPI.h
===================================================================
--- drivers/ACPI.h	(revision 28851)
+++ drivers/ACPI.h	(working copy)
@@ -124,7 +124,7 @@
 	} data;
 };
 
-#endif	// __ACTYPES_H__
+#endif	/* __ACTYPES_H__ */
 
 /* Sleep states */
 
@@ -145,7 +145,7 @@
 
 typedef struct acpi_device_info *acpi_device;
 
-//	Interface to one ACPI device.
+/*	Interface to one ACPI device. */
 typedef struct acpi_device_module_info {
 	driver_module_info info;
 
Index: drivers/ISA.h
===================================================================
--- drivers/ISA.h	(revision 28851)
+++ drivers/ISA.h	(working copy)
@@ -11,7 +11,7 @@
 #ifndef _ISA_H
 #define _ISA_H
 
-//#include <SupportDefs.h>
+/*#include <SupportDefs.h> */
 #include <bus_manager.h>
 
 #ifdef __cplusplus
Index: drivers/KernelExport.h
===================================================================
--- drivers/KernelExport.h	(revision 28851)
+++ drivers/KernelExport.h	(working copy)
@@ -14,9 +14,9 @@
 
 typedef ulong cpu_status;
 
-// WARNING: For Haiku debugging only! This changes the spinlock type in a
-// binary incompatible way!
-//#define B_DEBUG_SPINLOCK_CONTENTION	1
+/* WARNING: For Haiku debugging only! This changes the spinlock type in a */
+/* binary incompatible way! */
+/*#define B_DEBUG_SPINLOCK_CONTENTION	1 */
 
 #if B_DEBUG_SPINLOCK_CONTENTION
 	typedef struct {
@@ -94,7 +94,7 @@
 #define B_USER_CLONEABLE_AREA		256
 
 /* MTR attributes for mapping physical memory (Intel Architecture only) */
-// TODO: rename those to something more meaningful
+/* TODO: rename those to something more meaningful */
 #define	B_MTR_UC	0x10000000
 #define	B_MTR_WC	0x20000000
 #define	B_MTR_WT	0x30000000
Index: drivers/fs_interface.h
===================================================================
--- drivers/fs_interface.h	(revision 28851)
+++ drivers/fs_interface.h	(working copy)
@@ -25,10 +25,10 @@
 
 
 /* additional flags passed to write_stat() (see NodeMonitor.h for the others) */
-// NOTE: Changing the constants here or in NodeMonitor.h will break
-// src/kits/storage/LibBeAdapter.cpp:_kern_write_stat().
+/* NOTE: Changing the constants here or in NodeMonitor.h will break */
+/* src/kits/storage/LibBeAdapter.cpp:_kern_write_stat(). */
 #define B_STAT_SIZE_INSECURE	0x2000
-	// TODO: this should be faded out once BFS supports sparse files
+	/* TODO: this should be faded out once BFS supports sparse files */
 
 /* passed to write_fs_info() */
 #define	FS_WRITE_FSINFO_NAME	0x0001
@@ -40,7 +40,7 @@
 
 #define	B_CURRENT_FS_API_VERSION "/v1"
 
-// flags for publish_vnode() and fs_volume_ops::get_vnode()
+/* flags for publish_vnode() and fs_volume_ops::get_vnode() */
 #define B_VNODE_PUBLISH_REMOVED					0x01
 #define B_VNODE_DONT_CREATE_SPECIAL_SUB_NODE	0x02
 
@@ -243,7 +243,7 @@
 	struct module_info	info;
 	const char*			short_name;
 	const char*			pretty_name;
-	uint32				flags;	// DDM flags
+	uint32				flags;	/* DDM flags */
 
 	/* scanning (the device is write locked) */
 	float (*identify_partition)(int fd, partition_data *partition,
@@ -294,7 +294,7 @@
 
 /* file system add-ons only prototypes */
 
-// callbacks for do_iterative_fd_io()
+/* callbacks for do_iterative_fd_io() */
 typedef status_t (*iterative_io_get_vecs)(void *cookie, io_request* request,
 				off_t offset, size_t size, struct file_io_vec *vecs,
 				size_t *_count);
Index: drivers/tty/ttylayer.h
===================================================================
--- drivers/tty/ttylayer.h	(revision 28851)
+++ drivers/tty/ttylayer.h	(working copy)
@@ -12,7 +12,7 @@
 #include <termios.h>
 
 
-// XXX: should go away or be opacised
+/* XXX: should go away or be opacised */
 struct str {
 	uchar	*buffer;
 	uint	bufsize, count, tail;
@@ -36,7 +36,7 @@
 	uint	nopen;
 	uint	flags;
 	struct ddomain	dd;
-	struct ddomain	ddi;	// used in interrupt context
+	struct ddomain	ddi;	/* used in interrupt context */
 	pid_t	pgid;
 	struct termios	t;
 	uint	iactivity;
@@ -56,7 +56,7 @@
 	bigtime_t	vtime;
 };
 
-// flags
+/* flags */
 #define	TTYCARRIER		(1 << 0)
 #define	TTYWRITABLE		(1 << 1)
 #define	TTYWRITING		(1 << 2)
@@ -69,7 +69,7 @@
 #define	TTYHWRI			(1 << 9)
 #define	TTYFLOWFORCED	(1 << 10)
 
-// ops
+/* ops */
 #define	TTYENABLE		0
 #define	TTYDISABLE		1
 #define	TTYSETMODES		2
@@ -85,9 +85,9 @@
 
 typedef struct tty_module_info tty_module_info;
 
-// this version is compatible with BeOS R5
+/* this version is compatible with BeOS R5 */
 struct tty_module_info_r5 {
-	// not a real bus manager... no rescan() !
+	/* not a real bus manager... no rescan() ! */
 	module_info	mi;
 	status_t	(*ttyopen)(struct ttyfile *, struct ddrover *, tty_service_func);
 	status_t	(*ttyclose)(struct ttyfile *, struct ddrover *);
@@ -105,10 +105,10 @@
 	void	(*ddacquire)(struct ddrover *, struct ddomain *);
 };
 
-// BeOS R5.1d0 has a different module with the same version...
-// we exort this module as version 1.1 to allow using select from drivers
+/* BeOS R5.1d0 has a different module with the same version... */
+/* we exort this module as version 1.1 to allow using select from drivers */
 struct tty_module_info_dano {
-	// not a real bus manager... no rescan() !
+	/* not a real bus manager... no rescan() ! */
 	module_info	mi;
 	status_t	(*ttyopen)(struct ttyfile *, struct ddrover *, tty_service_func);
 	status_t	(*ttyclose)(struct ttyfile *, struct ddrover *);
Index: drivers/interrupt_controller.h
===================================================================
--- drivers/interrupt_controller.h	(revision 28851)
+++ drivers/interrupt_controller.h	(working copy)
@@ -13,11 +13,14 @@
 };
 
 typedef struct interrupt_controller_info {
-	int	cpu_count;		// number of supported CPUs
-	int	irq_count;		// number of supported IRQs
+	int	cpu_count;		/* number of supported CPUs
+ */
+	int	irq_count;		/* number of supported IRQs
+ */
 } interrupt_controller_info;
 
-// interrupt controller drivers
+/* interrupt controller drivers
+ */
 typedef struct interrupt_controller_module_info {
 	driver_module_info info;
 
@@ -27,13 +30,19 @@
 	status_t	(*enable_io_interrupt)(void *cookie, int irq, int type);
 	status_t	(*disable_io_interrupt)(void *cookie, int irq);
 
-	// Returns the IRQ number or a negative value, if the interrupt shall be
-	// ignore (spurious interrupts). Since more than one interrupt can be
-	// pending, the function should be called in a loop until it returns a
-	// negative value.
-	// Must be called with CPU interrupts disabled.
+	/* Returns the IRQ number or a negative value, if the interrupt shall be
+ */
+	/* ignore (spurious interrupts). Since more than one interrupt can be
+ */
+	/* pending, the function should be called in a loop until it returns a
+ */
+	/* negative value.
+ */
+	/* Must be called with CPU interrupts disabled.
+ */
 	int			(*acknowledge_io_interrupt)(void *cookie);
 
 } interrupt_controller_module_info;
 
-#endif	// _INTERRUPT_CONTROLLER_H
+#endif	/* _INTERRUPT_CONTROLLER_H
+ */
Index: drivers/disk_device_manager.h
===================================================================
--- drivers/disk_device_manager.h	(revision 28851)
+++ drivers/disk_device_manager.h	(working copy)
@@ -20,45 +20,45 @@
  * 	the disk system modules.
  */
 typedef struct partition_data {
-	partition_id	id;				// [sys]
+	partition_id	id;				/* [sys] */
 	off_t			offset;
 	off_t			size;
 	off_t			content_size;
 	uint32			block_size;
 	int32			child_count;
-	int32			index;			// [sys]
+	int32			index;			/* [sys] */
 	uint32			status;
 	uint32			flags;
-	dev_t			volume;			// [sys]
-	void			*mount_cookie;	// [sys] 
-	char			*name;			// max: B_OS_NAME_LENGTH
-	char			*content_name;	//
-	char			*type;			//
-	const char		*content_type;	// [sys]
+	dev_t			volume;			/* [sys] */
+	void			*mount_cookie;	/* [sys]  */
+	char			*name;			/* max: B_OS_NAME_LENGTH */
+	char			*content_name;	/* */
+	char			*type;			/* */
+	const char		*content_type;	/* [sys] */
 	char			*parameters;
 	char			*content_parameters;
 	void			*cookie;
 	void			*content_cookie;
 } partition_data;
 
-// C API disk device representation
+/* C API disk device representation */
 typedef struct disk_device_data {
-	partition_id	id;				// equal to that of the root partition
+	partition_id	id;				/* equal to that of the root partition */
 	uint32			flags;
 	char			*path;
 	device_geometry	geometry;
 } disk_device_data;
 
-// C API partitionable space representation
+/* C API partitionable space representation */
 typedef struct partitionable_space_data {
 	off_t	offset;
 	off_t	size;
 } partitionable_space_data;
 
-// operations on partitions
+/* operations on partitions */
 enum {
-	B_PARTITION_SHADOW,			// indicates creation of a shadow partition
-	B_PARTITION_SHADOW_CHILD,	//
+	B_PARTITION_SHADOW,			/* indicates creation of a shadow partition */
+	B_PARTITION_SHADOW_CHILD,	/* */
 	B_PARTITION_DEFRAGMENT,
 	B_PARTITION_REPAIR,
 	B_PARTITION_RESIZE,
@@ -75,64 +75,64 @@
 	B_PARTITION_DELETE_CHILD,
 };
 
-// disk device job cancel status
+/* disk device job cancel status */
 enum {
 	B_DISK_DEVICE_JOB_CONTINUE,
 	B_DISK_DEVICE_JOB_CANCEL,
 	B_DISK_DEVICE_JOB_REVERSE,
 };
 
-// disk device locking
+/* disk device locking */
 disk_device_data *write_lock_disk_device(partition_id partitionID);
 void write_unlock_disk_device(partition_id partitionID);
 disk_device_data *read_lock_disk_device(partition_id partitionID);
 void read_unlock_disk_device(partition_id partitionID);
-	// parameter is the ID of any partition on the device
+	/* parameter is the ID of any partition on the device */
 
-// getting disk devices/partitions by path
-// (no locking required)
+/* getting disk devices/partitions by path */
+/* (no locking required) */
 int32 find_disk_device(const char *path);
 int32 find_partition(const char *path);
 
-// disk device/partition read access
-// (read lock required)
+/* disk device/partition read access */
+/* (read lock required) */
 disk_device_data *get_disk_device(partition_id partitionID);
 partition_data *get_partition(partition_id partitionID);
 partition_data *get_parent_partition(partition_id partitionID);
 partition_data *get_child_partition(partition_id partitionID, int32 index);
 
-// partition write access
-// (write lock required)
+/* partition write access */
+/* (write lock required) */
 partition_data *create_child_partition(partition_id partitionID, int32 index,
 		partition_id childID);
-	// childID is an optional input parameter -- -1 to be ignored
+	/* childID is an optional input parameter -- -1 to be ignored */
 bool delete_partition(partition_id partitionID);
 void partition_modified(partition_id partitionID);
-	// tells the disk device manager, that the partition has been modified
+	/* tells the disk device manager, that the partition has been modified */
 
 status_t scan_partition(partition_id partitionID);
-	// Service method for disks systems: Synchronously scans the partition.
-	// Device must not be locked.
+	/* Service method for disks systems: Synchronously scans the partition. */
+	/* Device must not be locked. */
 
-// partition support functions
-// (no lock required)
+/* partition support functions */
+/* (no lock required) */
 status_t get_default_partition_content_name(partition_id partitionID,
 		const char* fileSystemName, char* buffer, size_t bufferSize);
-	// The partition_data::content_size field must already be initialized.
+	/* The partition_data::content_size field must already be initialized. */
 
-// disk systems
+/* disk systems */
 disk_system_id find_disk_system(const char *name);
 
-// jobs
+/* jobs */
 bool update_disk_device_job_progress(disk_job_id jobID, float progress);
 bool update_disk_device_job_extra_progress(disk_job_id jobID, const char *info);
 bool set_disk_device_job_error_message(disk_job_id jobID, const char *message);
 uint32 update_disk_device_job_interrupt_properties(disk_job_id jobID,
 		uint32 interruptProperties);
-	// returns one of B_DISK_DEVICE_JOB_{CONTINUE,CANCEL,REVERSE}
+	/* returns one of B_DISK_DEVICE_JOB_{CONTINUE,CANCEL,REVERSE} */
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif	// _DISK_DEVICE_MANAGER_H
+#endif	/* _DISK_DEVICE_MANAGER_H */
Index: drivers/bus/ISA.h
===================================================================
--- drivers/bus/ISA.h	(revision 28851)
+++ drivers/bus/ISA.h	(working copy)
@@ -30,8 +30,8 @@
 #include <device_manager.h>
 #include <ISA.h>
 
-// maximum size of one dma transfer
-// (in bytes for 8 bit transfer, in words for 16 bit transfer)
+/* maximum size of one dma transfer */
+/* (in bytes for 8 bit transfer, in words for 16 bit transfer) */
 #define B_MAX_ISA_DMA_COUNT	0x10000
 
 typedef struct isa2_module_info {
@@ -44,23 +44,23 @@
 	uint32 (*read_io_32)(int mapped_io_addr);
 	void (*write_io_32)(int mapped_io_addr, uint32 value);
 
-	// don't know what it's for, remains for compatibility
+	/* don't know what it's for, remains for compatibility */
 	void *(*ram_address)(const void *physical_address_in_system_memory);
 
-	// start dma transfer (scattered DMA is not supported as it's EISA specific)
+	/* start dma transfer (scattered DMA is not supported as it's EISA specific) */
 	status_t (*start_isa_dma)(
-		long	channel,				// dma channel to use
-		void	*buf,					// buffer to transfer
-		long	transfer_count,			// # transfers
-		uchar	mode,					// mode flags
-		uchar	e_mode					// extended mode flags
+		long	channel,				/* dma channel to use */
+		void	*buf,					/* buffer to transfer */
+		long	transfer_count,			/* # transfers */
+		uchar	mode,					/* mode flags */
+		uchar	e_mode					/* extended mode flags */
 	);
 } isa2_module_info;
 
-// type of isa device
+/* type of isa device */
 #define ISA_DEVICE_TYPE_NAME "isa/device/v1"
-// directory of ISA drivers
-// (there is only one device node, so put all drivers under "universal")
+/* directory of ISA drivers */
+/* (there is only one device node, so put all drivers under "universal") */
 #define ISA_DRIVERS_DIR "isa"
 
 
Index: drivers/bus/IDE.h
===================================================================
--- drivers/bus/IDE.h	(revision 28851)
+++ drivers/bus/IDE.h	(working copy)
@@ -11,29 +11,29 @@
 
 
 
-// Controller Driver Node
+/* Controller Driver Node */
 
-// attributes:
+/* attributes: */
 
-// node type
+/* node type */
 #define IDE_BUS_TYPE_NAME "bus/ide/v1"
-// maximum number of devices connected to controller (uint8, optional, default:2)
+/* maximum number of devices connected to controller (uint8, optional, default:2) */
 #define IDE_CONTROLLER_MAX_DEVICES_ITEM "ide/max_devices"
-// set to not-0 if DMA is supported (uint8, optional, default:0)
-// (if so, publish necessary blkdev restriction too)
+/* set to not-0 if DMA is supported (uint8, optional, default:0) */
+/* (if so, publish necessary blkdev restriction too) */
 #define IDE_CONTROLLER_CAN_DMA_ITEM "ide/can_DMA"
-// set to not-0 if CQ is supported (uint8, optional, default:1)
+/* set to not-0 if CQ is supported (uint8, optional, default:1) */
 #define IDE_CONTROLLER_CAN_CQ_ITEM "ide/can_CQ"
-// name of controller (string, required)
+/* name of controller (string, required) */
 #define IDE_CONTROLLER_CONTROLLER_NAME_ITEM "ide/controller_name"
 
 union ide_task_file;
 typedef unsigned int ide_reg_mask;
 
-// channel cookie, issued by ide bus manager
+/* channel cookie, issued by ide bus manager */
 typedef struct ide_bus_info *ide_channel;
 
-// interface of controller driver
+/* interface of controller driver */
 typedef struct {
 	driver_module_info info;
 
@@ -58,15 +58,15 @@
 } ide_controller_interface;
 
 
-// Interface for Controller Driver
+/* Interface for Controller Driver */
 
-// interface of bus manager as seen from controller driver
-// use this interface as the fixed consumer of your controller driver
+/* interface of bus manager as seen from controller driver */
+/* use this interface as the fixed consumer of your controller driver */
 typedef struct {
 	driver_module_info info;
 
-	// status - status read from controller (_not_ alt_status, as reading
-	//          normal status acknowledges IRQ request of device)
+	/* status - status read from controller (_not_ alt_status, as reading */
+	/*          normal status acknowledges IRQ request of device) */
 	status_t	(*irq_handler)( ide_channel channel, uint8 status );
 } ide_for_controller_interface;
 
Index: drivers/bus/SCSI.h
===================================================================
--- drivers/bus/SCSI.h	(revision 28851)
+++ drivers/bus/SCSI.h	(working copy)
@@ -97,72 +97,72 @@
 #include <device_manager.h>
 
 
-#define SCSI_MAX_CDB_SIZE 16	// max size of cdb
-#define SCSI_MAX_SENSE_SIZE	64	// max size of sense data
-#define SCSI_SIM_PRIV	1536	// SIM private data; this may be a bit much but
-								// we currently need that for the compatibility layer
+#define SCSI_MAX_CDB_SIZE 16	/* max size of cdb */
+#define SCSI_MAX_SENSE_SIZE	64	/* max size of sense data */
+#define SCSI_SIM_PRIV	1536	/* SIM private data; this may be a bit much but */
+								/* we currently need that for the compatibility layer */
 
-// bus/device handle
+/* bus/device handle */
 typedef struct scsi_bus_info *scsi_bus;
 typedef struct scsi_device_info *scsi_device;
 
 
-// structure of one scsi i/o CCB (command control block)
+/* structure of one scsi i/o CCB (command control block) */
 typedef struct scsi_ccb {
-	struct scsi_ccb *next, *prev;	// internal
+	struct scsi_ccb *next, *prev;	/* internal */
 
-	uchar		subsys_status;		// Returned subsystem status
-	uchar		device_status;		// Returned scsi device status
+	uchar		subsys_status;		/* Returned subsystem status */
+	uchar		device_status;		/* Returned scsi device status */
 
-	uchar		path_id;			// Path ID for the request
-	uchar		target_id;			// Target device ID
-	uchar		target_lun;			// Target LUN number
-	uint32		flags;				// Flags for operation of the subsystem
+	uchar		path_id;			/* Path ID for the request */
+	uchar		target_id;			/* Target device ID */
+	uchar		target_lun;			/* Target LUN number */
+	uint32		flags;				/* Flags for operation of the subsystem */
 
-	// released once after asynchronous execution of request;
-	// initialised by alloc_ccb, can be replaced for action but
-	// must be restored before returning via free_ccb
+	/* released once after asynchronous execution of request; */
+	/* initialised by alloc_ccb, can be replaced for action but */
+	/* must be restored before returning via free_ccb */
 	sem_id		completion_sem;
 
-	uint8		cdb[SCSI_MAX_CDB_SIZE];  // command data block
-	uchar		cdb_length;			// length of command in bytes
-	int64		sort;				// value of command to sort on (<0 means n/a)
-	bigtime_t	timeout;			// timeout - 0 = use default
+	uint8		cdb[SCSI_MAX_CDB_SIZE];  /* command data block */
+	uchar		cdb_length;			/* length of command in bytes */
+	int64		sort;				/* value of command to sort on (<0 means n/a) */
+	bigtime_t	timeout;			/* timeout - 0 = use default */
 
-	uchar		*data;				// pointer to data
-	const physical_entry *sg_list;	// scatter/gather list
-	uint16		sg_count;			// number of S/G entries
-	uint32		data_length;		// length of data
-	int32		data_resid;			// data transfer residual length: 2's comp
+	uchar		*data;				/* pointer to data */
+	const physical_entry *sg_list;	/* scatter/gather list */
+	uint16		sg_count;			/* number of S/G entries */
+	uint32		data_length;		/* length of data */
+	int32		data_resid;			/* data transfer residual length: 2's comp */
 	void		*io_operation;
 
-	uchar		sense[SCSI_MAX_SENSE_SIZE]; // autosense data
-	uchar		sense_resid;		// autosense resid length: 2's comp
+	uchar		sense[SCSI_MAX_SENSE_SIZE]; /* autosense data */
+	uchar		sense_resid;		/* autosense resid length: 2's comp */
 
-	// private
-	bool		ordered : 1;		// request cannot overtake/be overtaken by others
-	bool		buffered : 1;		// data is buffered to make it DMA safe
-	bool		emulated : 1;		// command is executed as part of emulation
+	/* private */
+	bool		ordered : 1;		/* request cannot overtake/be overtaken by others */
+	bool		buffered : 1;		/* data is buffered to make it DMA safe */
+	bool		emulated : 1;		/* command is executed as part of emulation */
 
-	scsi_bus	bus;				// associated bus
-	scsi_device	device;				// associated device
-	struct dma_buffer *dma_buffer;	// used dma buffer, or NULL
-	uchar 		state;				// bus manager state
+	scsi_bus	bus;				/* associated bus */
+	scsi_device	device;				/* associated device */
+	struct dma_buffer *dma_buffer;	/* used dma buffer, or NULL */
+	uchar 		state;				/* bus manager state */
 
-	// original data before command emulation was applied
+	/* original data before command emulation was applied */
 	uint8		orig_cdb[SCSI_MAX_CDB_SIZE];
 	uchar		orig_cdb_length;
 	const physical_entry *orig_sg_list;
 	uint16		orig_sg_count;
 	uint32		orig_data_length;
 
-	// private SIM data
-	uchar		sim_state;			// set to zero when request is submitted first time
+	/* private SIM data */
+	uchar		sim_state;			/* set to zero when request is submitted first time */
 	uchar		sim_priv[SCSI_SIM_PRIV];	/* SIM private data area */
 } scsi_ccb;
 
 
-// Defines for the subsystem status field
+/* Defines for the subsystem status field */
 
 #define	SCSI_REQ_INPROG			0x00	/* request is in progress */
 #define SCSI_REQ_CMP 			0x01	/* request completed w/out error */
@@ -207,7 +207,7 @@
 #define SCSI_SUBSYS_STATUS_MASK 0x3F	/* Mask bits for just the status # */
 
 
-// Defines for the flags field
+/* Defines for the flags field */
 
 #define SCSI_DIR_RESV			0x00000000	/* Data direction (00: reserved) */
 #define SCSI_DIR_IN				0x00000040	/* Data direction (01: DATA IN) */
@@ -216,8 +216,8 @@
 #define SCSI_DIR_MASK			0x000000C0
 
 #define SCSI_DIS_AUTOSENSE		0x00000020	/* Disable autosense feature */
-#define SCSI_ORDERED_QTAG		0x00000010	// ordered queue (cannot overtake/be overtaken)
-#define SCSI_DMA_SAFE			0x00000008	// set if data buffer is DMA approved
+#define SCSI_ORDERED_QTAG		0x00000010	/* ordered queue (cannot overtake/be overtaken) */
+#define SCSI_DMA_SAFE			0x00000008	/* set if data buffer is DMA approved */
 
 #define SCSI_DIS_DISCONNECT		0x00008000	/* Disable disconnect */
 #define SCSI_INITIATE_SYNC		0x00004000	/* Attempt Sync data xfer, and SDTR */
@@ -225,9 +225,9 @@
 #define SCSI_ENG_SYNC			0x00000200	/* Flush resid bytes before cmplt */
 
 
-// Defines for the Path Inquiry CCB fields
+/* Defines for the Path Inquiry CCB fields */
 
-// flags in hba_inquiry
+/* flags in hba_inquiry */
 #define SCSI_PI_MDP_ABLE		0x80	/* Supports MDP message */
 #define SCSI_PI_WIDE_32			0x40	/* Supports 32 bit wide SCSI */
 #define SCSI_PI_WIDE_16			0x20	/* Supports 16 bit wide SCSI */
@@ -235,11 +235,11 @@
 #define SCSI_PI_TAG_ABLE		0x02	/* Supports tag queue message */
 #define SCSI_PI_SOFT_RST		0x01	/* Supports soft reset */
 
-// flags in hba_misc
+/* flags in hba_misc */
 #define SCSI_PIM_SCANHILO		0x80	/* Bus scans from ID 7 to ID 0 */
 #define SCSI_PIM_NOREMOVE		0x40	/* Removable dev not included in scan */
 
-// sizes of inquiry fields
+/* sizes of inquiry fields */
 #define SCSI_VUHBA		14				/* Vendor Unique HBA length */
 #define SCSI_SIM_ID		16				/* ASCII string len for SIM ID */
 #define SCSI_HBA_ID		16				/* ASCII string len for HBA ID */
@@ -248,7 +248,7 @@
 #define SCSI_VERS		 8				/* ASCII string len for SIM & HBA vers */
 
 
-// Path inquiry, extended by BeOS XPT_EXTENDED_PATH_INQ parameters
+/* Path inquiry, extended by BeOS XPT_EXTENDED_PATH_INQ parameters */
 typedef struct {
 	uchar		version_num;			/* Version number for the SIM/HBA */
 	uchar		hba_inquiry;			/* Mimic of INQ byte 7 for the HBA */
@@ -256,7 +256,7 @@
 	uint32		sim_priv;				/* Size of SIM private data area */
 	uchar		vuhba_flags[SCSI_VUHBA];/* Vendor unique capabilities */
 	uchar		initiator_id;			/* ID of the HBA on the SCSI bus */
-	uint32		hba_queue_size;			// size of adapaters command queue
+	uint32		hba_queue_size;			/* size of adapaters command queue */
 	char		sim_vid[SCSI_SIM_ID];	/* Vendor ID of the SIM */
 	char		hba_vid[SCSI_HBA_ID];	/* Vendor ID of the HBA */
 
@@ -267,55 +267,55 @@
 } scsi_path_inquiry;
 
 
-// Device node
+/* Device node */
 
-// target (uint8)
+/* target (uint8) */
 #define SCSI_DEVICE_TARGET_ID_ITEM "scsi/target_id"
-// lun (uint8)
+/* lun (uint8) */
 #define SCSI_DEVICE_TARGET_LUN_ITEM "scsi/target_lun"
-// node type
+/* node type */
 #define SCSI_DEVICE_TYPE_NAME "scsi/device/v1"
-// device inquiry data (raw scsi_res_inquiry)
+/* device inquiry data (raw scsi_res_inquiry) */
 #define SCSI_DEVICE_INQUIRY_ITEM "scsi/device_inquiry"
-// device type (uint8)
+/* device type (uint8) */
 #define SCSI_DEVICE_TYPE_ITEM "scsi/type"
-// vendor name (string)
+/* vendor name (string) */
 #define SCSI_DEVICE_VENDOR_ITEM "scsi/vendor"
-// product name (string)
+/* product name (string) */
 #define SCSI_DEVICE_PRODUCT_ITEM "scsi/product"
-// revision (string)
+/* revision (string) */
 #define SCSI_DEVICE_REVISION_ITEM "scsi/revision"
 
-// maximum targets on scsi bus
+/* maximum targets on scsi bus */
 #define SCSI_DEVICE_MAX_TARGET_COUNT "scsi/max_target_count"
 
-// directory containing links to peripheral drivers
+/* directory containing links to peripheral drivers */
 #define SCSI_PERIPHERAL_DRIVERS_DIR "scsi"
 
-// bus manager device interface for peripheral driver
+/* bus manager device interface for peripheral driver */
 typedef struct scsi_device_interface {
 	driver_module_info info;
 
-	// get CCB
-	// warning: if pool of CCBs is exhausted, this call is delayed until a
-	// CCB is freed, so don't try to allocate more then one CCB at once!
+	/* get CCB */
+	/* warning: if pool of CCBs is exhausted, this call is delayed until a */
+	/* CCB is freed, so don't try to allocate more then one CCB at once! */
 	scsi_ccb *(*alloc_ccb)(scsi_device device);
-	// free CCB
+	/* free CCB */
 	void (*free_ccb)(scsi_ccb *ccb);
 
-	// execute command asynchronously
-	// when it's finished, the semaphore of the ccb is released
-	// you must provide a S/G list if data_len != 0
+	/* execute command asynchronously */
+	/* when it's finished, the semaphore of the ccb is released */
+	/* you must provide a S/G list if data_len != 0 */
 	void (*async_io)(scsi_ccb *ccb);
-	// execute command synchronously
-	// you don't need to provide a S/G list nor have to lock data
+	/* execute command synchronously */
+	/* you don't need to provide a S/G list nor have to lock data */
 	void (*sync_io)(scsi_ccb *ccb);
 
-	// abort request
+	/* abort request */
 	uchar (*abort)(scsi_ccb *ccb_to_abort);
-	// reset device
+	/* reset device */
 	uchar (*reset_device)(scsi_device device);
-	// terminate request
+	/* terminate request */
 	uchar (*term_io)(scsi_ccb *ccb_to_terminate);
 
 	status_t (*ioctl)(scsi_device device, uint32 op, void *buffer, size_t length);
@@ -324,83 +324,83 @@
 #define SCSI_DEVICE_MODULE_NAME "bus_managers/scsi/device/driver_v1"
 
 
-// Bus node
+/* Bus node */
 
-// attributes:
+/* attributes: */
 
-// path (uint8)
+/* path (uint8) */
 #define SCSI_BUS_PATH_ID_ITEM "scsi/path_id"
-// node type
+/* node type */
 #define SCSI_BUS_TYPE_NAME "scsi/bus"
 
-// SCSI bus node driver.
-// This interface can be used by peripheral drivers to access the
-// bus directly.
+/* SCSI bus node driver. */
+/* This interface can be used by peripheral drivers to access the */
+/* bus directly. */
 typedef struct scsi_bus_interface {
 	driver_module_info info;
 
-	// get information about host controller
+	/* get information about host controller */
 	uchar (*path_inquiry)(scsi_bus bus, scsi_path_inquiry *inquiry_data);
-	// reset SCSI bus
+	/* reset SCSI bus */
 	uchar (*reset_bus)(scsi_bus bus);
 } scsi_bus_interface;
 
-// name of SCSI bus node driver
+/* name of SCSI bus node driver */
 #define SCSI_BUS_MODULE_NAME "bus_managers/scsi/bus/driver_v1"
 
 
-// Interface for SIM
+/* Interface for SIM */
 
-// cookie for dpc
+/* cookie for dpc */
 typedef struct scsi_dpc_info *scsi_dpc_cookie;
 
-// Bus manager interface used by SCSI controller drivers.
-// SCSI controller drivers get this interface passed via their init_device
-// method. Further, they must specify this driver as their fixed consumer.
+/* Bus manager interface used by SCSI controller drivers. */
+/* SCSI controller drivers get this interface passed via their init_device */
+/* method. Further, they must specify this driver as their fixed consumer. */
 typedef struct scsi_for_sim_interface {
 	driver_module_info info;
 
-	// put request into wait queue because of overflow
-	// bus_overflow: true - too many bus requests
-	//               false - too many device requests
-	// bus/device won't receive requests until cont_sent_bus/cont_send_device
-	// is called or a request is finished via finished();
-	// to avoid race conditions (reporting a full and a available bus at once)
-	// the SIM should synchronize calls to requeue, resubmit and finished
+	/* put request into wait queue because of overflow */
+	/* bus_overflow: true - too many bus requests */
+	/*               false - too many device requests */
+	/* bus/device won't receive requests until cont_sent_bus/cont_send_device */
+	/* is called or a request is finished via finished(); */
+	/* to avoid race conditions (reporting a full and a available bus at once) */
+	/* the SIM should synchronize calls to requeue, resubmit and finished */
 	void (*requeue)(scsi_ccb *ccb, bool bus_overflow);
-	// resubmit request ASAP
-	// to be used if execution of request went wrong and must be retried
+	/* resubmit request ASAP */
+	/* to be used if execution of request went wrong and must be retried */
 	void (*resubmit)(scsi_ccb *ccb);
-	// mark request as being finished
-	// num_requests: number of requests that were handled by device
-	//               when the request was sent (read: how full was the device
-	//               queue); needed to find out how large the device queue is;
-	//               e.g. if three were already running plus this request makes
-	//               num_requests=4
+	/* mark request as being finished */
+	/* num_requests: number of requests that were handled by device */
+	/*               when the request was sent (read: how full was the device */
+	/*               queue); needed to find out how large the device queue is; */
+	/*               e.g. if three were already running plus this request makes */
+	/*               num_requests=4 */
 	void (*finished)(scsi_ccb *ccb, uint num_requests);
 
-	// following functions return error on invalid arguments only
+	/* following functions return error on invalid arguments only */
 	status_t (*alloc_dpc)(scsi_dpc_cookie *dpc);
 	status_t (*free_dpc)(scsi_dpc_cookie dpc);
 	status_t (*schedule_dpc)(scsi_bus cookie, scsi_dpc_cookie dpc, /*int flags,*/
 		void (*func)( void * ), void *arg);
 
-	// block entire bus (can be nested)
-	// no more request will be submitted to this bus
+	/* block entire bus (can be nested) */
+	/* no more request will be submitted to this bus */
 	void (*block_bus)(scsi_bus bus);
-	// unblock entire bus
-	// requests will be submitted to bus ASAP
+	/* unblock entire bus */
+	/* requests will be submitted to bus ASAP */
 	void (*unblock_bus)(scsi_bus bus);
-	// block one device
-	// no more requests will be submitted to this device
+	/* block one device */
+	/* no more requests will be submitted to this device */
 	void (*block_device)(scsi_device device);
-	// unblock device
-	// requests for this device will be submitted ASAP
+	/* unblock device */
+	/* requests for this device will be submitted ASAP */
 	void (*unblock_device)(scsi_device device);
 
-	// terminate bus overflow condition (see "requeue")
+	/* terminate bus overflow condition (see "requeue") */
 	void (*cont_send_bus)(scsi_bus bus);
-	// terminate device overflow condition (see "requeue")
+	/* terminate device overflow condition (see "requeue") */
 	void (*cont_send_device)(scsi_device device);
 } scsi_for_sim_interface;
 
@@ -408,53 +408,53 @@
 #define SCSI_FOR_SIM_MODULE_NAME "bus_managers/scsi/sim/driver_v1"
 
 
-// SIM Node
+/* SIM Node */
 
-// attributes:
+/* attributes: */
 
-// node type
+/* node type */
 #define SCSI_SIM_TYPE_NAME "bus/scsi/v1"
-// controller name (required, string)
+/* controller name (required, string) */
 #define SCSI_DESCRIPTION_CONTROLLER_NAME "controller_name"
 
 typedef void *scsi_sim_cookie;
 
-// SIM interface
-// SCSI controller drivers must provide this interface
+/* SIM interface */
+/* SCSI controller drivers must provide this interface */
 typedef struct scsi_sim_interface {
 	driver_module_info info;
 
 	void (*set_scsi_bus)(scsi_sim_cookie cookie, scsi_bus bus);
 
-	// execute request
+	/* execute request */
 	void (*scsi_io)(scsi_sim_cookie cookie, scsi_ccb *ccb);
-	// abort request
+	/* abort request */
 	uchar (*abort)(scsi_sim_cookie cookie, scsi_ccb *ccb_to_abort);
-	// reset device
+	/* reset device */
 	uchar (*reset_device)(scsi_sim_cookie cookie, uchar target_id, uchar target_lun);
-	// terminate request
+	/* terminate request */
 	uchar (*term_io)(scsi_sim_cookie cookie, scsi_ccb *ccb_to_terminate);
 
-	// get information about bus
+	/* get information about bus */
 	uchar (*path_inquiry)(scsi_sim_cookie cookie, scsi_path_inquiry *inquiry_data);
-	// scan bus
-	// this is called immediately before the SCSI bus manager scans the bus
+	/* scan bus */
+	/* this is called immediately before the SCSI bus manager scans the bus */
 	uchar (*scan_bus)(scsi_sim_cookie cookie);
-	// reset bus
+	/* reset bus */
 	uchar (*reset_bus)(scsi_sim_cookie cookie);
 
-	// get restrictions of one device
-	// (used for non-SCSI transport protocols and bug fixes)
+	/* get restrictions of one device */
+	/* (used for non-SCSI transport protocols and bug fixes) */
 	void (*get_restrictions)(scsi_sim_cookie 	cookie,
-		uchar				target_id,		// target id
-		bool				*is_atapi, 		// set to true if this is an ATAPI device that
-											// needs some commands emulated
-		bool				*no_autosense,	// set to true if there is no autosense;
-											// the SCSI bus manager will request sense on
-											// SCSI_REQ_CMP_ERR/SCSI_STATUS_CHECK_CONDITION
-		uint32 				*max_blocks );	// maximum number of blocks per transfer if > 0;
-											// used for buggy devices that cannot handle
-											// large transfers (read: ATAPI ZIP drives)
+		uchar				target_id,		/* target id */
+		bool				*is_atapi, 		/* set to true if this is an ATAPI device that */
+											/* needs some commands emulated */
+		bool				*no_autosense,	/* set to true if there is no autosense; */
+											/* the SCSI bus manager will request sense on */
+											/* SCSI_REQ_CMP_ERR/SCSI_STATUS_CHECK_CONDITION */
+		uint32 				*max_blocks );	/* maximum number of blocks per transfer if > 0; */
+											/* used for buggy devices that cannot handle */
+											/* large transfers (read: ATAPI ZIP drives) */
 
 	status_t (*ioctl)(scsi_sim_cookie, uint8 targetID, uint32 op, void *buffer, size_t length);
 } scsi_sim_interface;
Index: drivers/usb/USB_langIDs.h
===================================================================
--- drivers/usb/USB_langIDs.h	(revision 28851)
+++ drivers/usb/USB_langIDs.h	(working copy)
@@ -1,173 +1,173 @@
 #ifndef USB_LANGIDS_H
 #define USB_LANGIDS_H
 
-// USB Language Identifiers, 3/29/2000, version 1.0
-// Reference: http://www.usb.org/developers/docs/USB_LANGIDs.pdf
+/* USB Language Identifiers, 3/29/2000, version 1.0 */
+/* Reference: http://www.usb.org/developers/docs/USB_LANGIDs.pdf */
 
-#define USB_LANGIDS_VERSION		0x0100	// version 1.0
+#define USB_LANGIDS_VERSION		0x0100	/* version 1.0 */
 
-// descriptor string index 0 = supported LANGIDs array
+/* descriptor string index 0 = supported LANGIDs array */
 #define USB_LANGIDS_STRING_INDEX	(0)
-
-#define USB_PRIMARY_LANGID_MASK		(0x003F)		// 9 to 0 bits 
-#define USB_SUB_LANGID_MASK			(0xFC00)		// 15 to 10 bits			
-
-#define USB_PRIMARY_LANGID(id)		(id & USB_PRIMARY_LANGID_MASK)
-#define USB_SUB_LANGID(id)			((id & USB_SUB_LANGID_MASK) >> 10)
 
+#define USB_PRIMARY_LANGID_MASK		(0x003F)		/* 9 to 0 bits  */
+#define USB_SUB_LANGID_MASK			(0xFC00)		/* 15 to 10 bits			 */
+
+#define USB_PRIMARY_LANGID(id)		(id & USB_PRIMARY_LANGID_MASK)
+#define USB_SUB_LANGID(id)			((id & USB_SUB_LANGID_MASK) >> 10)
+
 enum {
-	USB_LANGID_AFRIKAANS				= 0x0436,	// Afrikaans
-	USB_LANGID_ALBANIAN					= 0x041c,	// Albanian
-	USB_LANGID_ARABIC_SAUDI_ARABIA		= 0x0401,	// Arabic (Saudi Arabia)
-	USB_LANGID_ARABIC_IRAK				= 0x0801,	// Arabic (Irak)
-	USB_LANGID_ARABIC_EGYPT				= 0x0c01,	// Arabic (Egypt)
-	USB_LANGID_ARABIC_LYBYA				= 0x1001,	// Arabic (Libya)
-	USB_LANGID_ARABIC_ALGERIA			= 0x1401,	// Arabic (Algeria)
-	USB_LANGID_ARABIC_MOROCCO			= 0x1801,	// Arabic (Morocco)
-	USB_LANGID_ARABIC_TUNISIA			= 0x1c01,	// Arabic (Tunisia)
-	USB_LANGID_ARABIC_OMAN				= 0x2001,	// Arabic (Oman)
-	USB_LANGID_ARABIC_YEMEN				= 0x2401,	// Arabic (Yemen)
-	USB_LANGID_ARABIC_SYRIA				= 0x2801,	// Arabic (Syria)
-	USB_LANGID_ARABIC_JORDAN			= 0x2c01,	// Arabic (Jordan)
-	USB_LANGID_ARABIC_LEBANON			= 0x3001,	// Arabic (Lebanon)
-	USB_LANGID_ARABIC_KUWAIT			= 0x3401,	// Arabic (Kuwait)
-	USB_LANGID_ARABIC_UAE				= 0x3801,	// Arabic (U.A.E.)
-	USB_LANGID_ARABIC_BAHRAIN			= 0x3c01,	// Arabic (Bahrain)
-	USB_LANGID_ARABIC_QATAR				= 0x4001,	// Arabic (Qatar)
-	USB_LANGID_ARMENIAN					= 0x042b,	// Armenian
-	USB_LANGID_ASSAMESE					= 0x044d,	// Assamese
-	USB_LANGID_AZERI_LATIN				= 0x042c,	// Azeri (Latin)
-	USB_LANGID_AZERI_CYRILLIC			= 0x082c,	// Azeri (Cyrillic)
-	USB_LANGID_BASQUE					= 0x042d,	// Basque
-	USB_LANGID_BELARUSSIAN				= 0x0423,	// Belarussian
-	USB_LANGID_BENGALI					= 0x0445,	// Bengali
-	USB_LANGID_BULGARIAN				= 0x0402,	// Bulgarian
-	USB_LANGID_BURMESE					= 0x0455,	// Burmese
-	USB_LANGID_CATALAN					= 0x0403,	// Catalan
-	USB_LANGID_CHINESE_TAIWAN			= 0x0404,	// Chinese (Taiwan)
-	USB_LANGID_CHINESE_PRC				= 0x0804,	// Chinese (PRC = People Republic of Chinese)
-	USB_LANGID_CHINESE_HONG_KONG		= 0x0c04,	// Chinese (Hong Kong)
-	USB_LANGID_CHINESE_SINGAPORE		= 0x1004,	// Chinese (Singapore)
-	USB_LANGID_CHINESE_MACAU_SAR		= 0x1404,	// Chinese (Macau SAR)
-	USB_LANGID_CROATIAN					= 0x041a,	// Croatian
-	USB_LANGID_CZECH					= 0x0405,	// Czech
-	USB_LANGID_DANISH					= 0x0406,	// Danish
-	USB_LANGID_DUTCH_NETHERLANDS		= 0x0413,	// Dutch (Netherlands)
-	USB_LANGID_DUTCH_BELGIUM			= 0x0813,	// Dutch (Belgium)
-	USB_LANGID_ENGLISH_UNITED_STATES	= 0x0409,	// English (United States)	
-	USB_LANGID_ENGLISH_UNITED_KINGDOM	= 0x0809,	// English (United Kingdom)	
-	USB_LANGID_ENGLISH_AUSTRALIAN		= 0x0c09,	// English (Australian)	
-	USB_LANGID_ENGLISH_CANADIAN			= 0x1009,	// English (Canadian)	
-	USB_LANGID_ENGLISH_NEW_ZEALAND		= 0x1409,	// English (New Zealand)	
-	USB_LANGID_ENGLISH_IRELAND			= 0x1809,	// English (Ireland)	
-	USB_LANGID_ENGLISH_SOUTH_AFRICA		= 0x1c09,	// English (South Africa)	
-	USB_LANGID_ENGLISH_JAMAICA			= 0x2009,	// English (Jamaica)	
-	USB_LANGID_ENGLISH_CARIBBEAN		= 0x2409,	// English (Caribbean)	
-	USB_LANGID_ENGLISH_BELIZE			= 0x2809,	// English (Belize)	
-	USB_LANGID_ENGLISH_TRINIDAD			= 0x2c09,	// English (Trinidad)	
-	USB_LANGID_ENGLISH_ZIMBABWE			= 0x3009,	// English (Zimbabwe)	
-	USB_LANGID_ENGLISH_PHLIPPINES		= 0x3409,	// English (Philippines)	
-	USB_LANGID_ESTONIAN					= 0x0425,	// Estonian
-	USB_LANGID_FAEROESE					= 0x0438,	// Faeroese
-	USB_LANGID_FARSI					= 0x0429,	// Farsi
-	USB_LANGID_FINNISH					= 0x040b,	// Finnish
-	USB_LANGID_FRENCH_STANDARD			= 0x040c,	// French (Standard)
-	USB_LANGID_FRENCH_BELGIAN			= 0x080c,	// French (Belgian)
-	USB_LANGID_FRENCH_CANADIAN			= 0x0c0c,	// French (Canadian)
-	USB_LANGID_FRENCH_SWITZERLAND		= 0x100c,	// French (Switzerland)
-	USB_LANGID_FRENCH_LUXEMBOURG		= 0x140c,	// French (Luxembourg)
-	USB_LANGID_FRENCH_MONACO			= 0x180c,	// French (Monaco)
-	USB_LANGID_GEORGIAN					= 0x0437,	// Georgian
-	USB_LANGID_GERMAN_STANDARD			= 0x0407,	// German (Standard)
-	USB_LANGID_GERMAN_SWITZERLAND		= 0x0807,	// German (Switzerland)
-	USB_LANGID_GERMAN_AUSTRIA			= 0x0c07,	// German (Austria)
-	USB_LANGID_GERMAN_LUXEMBOURG		= 0x1007,	// German (Luxembourg)
-	USB_LANGID_GERMAN_LIECHTENSTEIN		= 0x1407,	// German (Liechtenstein)
-	USB_LANGID_GREEK					= 0x0408,	// Greek
-	USB_LANGID_GUJARATI					= 0x0447,	// Gujarati
-	USB_LANGID_HEBREW					= 0x040d,	// Hebrew
-	USB_LANGID_HINDI					= 0x0439,	// Hindi
-	USB_LANGID_HUNGARIAN				= 0x040e,	// Hungarian
-	USB_LANGID_ICELANDIC				= 0x040f,	// Icelandic
-	USB_LANGID_INDONESIAN				= 0x0421,	// Indonesian
-	USB_LANGID_ITALIAN_STANDARD			= 0x0410,	// Italian (Standard)
-	USB_LANGID_ITALIAN_SWITZERLAND		= 0x0810,	// Italian (Switzerland)
-	USB_LANGID_JAPANESE					= 0x0411,	// Japanese
-	USB_LANGID_KANNADA					= 0x044b,	// Kannada
-	USB_LANGID_KASHMIRI_INDIA			= 0x0860,	// Kashmiri (India)
-	USB_LANGID_KAZAKH					= 0x043f,	// Kazakh
-	USB_LANGID_KONKANI					= 0x0457,	// Konkani
-	USB_LANGID_KOREAN_JOHAB				= 0x0412,	// Korean (Johab)
-	USB_LANGID_LATVIAN					= 0x0426,	// Latvian
-	USB_LANGID_LITHUANIAN				= 0x0427,	// Lithuanian
-	USB_LANGID_LITHUANIAN_CLASSIC		= 0x0827,	// Lithuanian (Classic)
-	USB_LANGID_MACEDONIAN				= 0x042f,	// Macedonian
-	USB_LANGID_MALAY_MALAYSIAN			= 0x043e,	// Malay (Malaysian)
-	USB_LANGID_MALAY_BRUNEI_DARUSSALAM	= 0x083e,	// Malay (Brunei Darussalam)
-	USB_LANGID_MALAYALAM				= 0x044c,	// Malayalam
-	USB_LANGID_MANIPURI					= 0x0458,	// Manipuri
-	USB_LANGID_MARATHI					= 0x044e,	// Marathi
-	USB_LANGID_NEPALI_INDIA				= 0x0861,	// Nepali (India)
-	USB_LANGID_NORWEGIAN_BOKMAL			= 0x0414,	// Norwegian (Bokmal)
-	USB_LANGID_NORWEGIAN_NYNORSK		= 0x0814,	// Norwegian (Nynorsk)
-	USB_LANGID_ORIYA					= 0x0448,	// Oriya
-	USB_LANGID_POLISH					= 0x0415,	// Polish
-	USB_LANGID_PORTUGUESE_BRAZIL		= 0x0416,	// Portuguese (Brazil)
-	USB_LANGID_PORTUGUESE_STANDARD		= 0x0816,	// Portuguese (Standard)
-	USB_LANGID_PUNJABI					= 0x0446,	// Punjabi
-	USB_LANGID_ROMANIAN					= 0x0418,	// Romanian
-	USB_LANGID_RUSSIAN					= 0x0419,	// Russian
-	USB_LANGID_SANSKRIT					= 0x044f,	// Sanskrit
-	USB_LANGID_SERBIAN_CYRILLIC			= 0x0c1a,	// Serbian (Cyrillic)
-	USB_LANGID_SERBIAN_LATIN			= 0x081a,	// Serbian (Latin)
-	USB_LANGID_SINDHI					= 0x0459,	// Sindhi
-	USB_LANGID_SLOVAK					= 0x041b,	// Slovak
-	USB_LANGID_SLOVENIAN				= 0x0424,	// Slovenian
-	USB_LANGID_SPANNISH_TRADITIONAL_SORT= 0x040a,	// Spannish (Traditional Sort)
-	USB_LANGID_SPANNISH_MEXICAN			= 0x080a,	// Spannish (Mexican)
-	USB_LANGID_SPANNISH_MODERN_SORT		= 0x0c0a,	// Spannish (Modern Sort)
-	USB_LANGID_SPANNISH_GUATEMALA		= 0x100a,	// Spannish (Guatemala)
-	USB_LANGID_SPANNISH_COSTA_RICA		= 0x140a,	// Spannish (Costa Rica)
-	USB_LANGID_SPANNISH_PANAMA			= 0x180a,	// Spannish (Panama)
-	USB_LANGID_SPANNISH_DOMINICAN_REPUBLIC	= 0x1c0a,	// Spannish (Dominican Republic)
-	USB_LANGID_SPANNISH_VENEZUELA		= 0x200a,	// Spannish (Venezuela)
-	USB_LANGID_SPANNISH_COLOMBIA		= 0x240a,	// Spannish (Colombia)
-	USB_LANGID_SPANNISH_PERU			= 0x280a,	// Spannish (Peru)
-	USB_LANGID_SPANNISH_ARGENTINA		= 0x2c0a,	// Spannish (Argentina)
-	USB_LANGID_SPANNISH_ECUADOR			= 0x300a,	// Spannish (Ecuador)
-	USB_LANGID_SPANNISH_CHILE			= 0x340a,	// Spannish (Chile)
-	USB_LANGID_SPANNISH_URUGUAY			= 0x380a,	// Spannish (Uruguay)
-	USB_LANGID_SPANNISH_PARAGUAY		= 0x3c0a,	// Spannish (Paraguay)
-	USB_LANGID_SPANNISH_BOLIVIA			= 0x400a,	// Spannish (Bolivia)
-	USB_LANGID_SPANNISH_EL_SALVADOR		= 0x440a,	// Spannish (El Salvador)
-	USB_LANGID_SPANNISH_HONDURAS		= 0x480a,	// Spannish (Honduras)
-	USB_LANGID_SPANNISH_NICARAGUA		= 0x4c0a,	// Spannish (Nicaragua)
-	USB_LANGID_SPANNISH_PUERTO_RICO		= 0x500a,	// Spannish (Puerto Rico)
-	USB_LANGID_SUTU						= 0x0430,	// Sutu
-	USB_LANGID_SWAHILI_KENYA			= 0x0441,	// Swahili (Kenya)
-	USB_LANGID_SWEDISH					= 0x041d,	// Swedish
-	USB_LANGID_SWEDISH_FINLAND			= 0x081d,	// Swedish (Finland)
-	USB_LANGID_TAMIL					= 0x0449,	// Tamil
-	USB_LANGID_TATAR_TATARSTAN			= 0x0444,	// Tatar (Tatarstan)
-	USB_LANGID_TELUGU					= 0x044a,	// Telugu
-	USB_LANGID_THAI						= 0x041e,	// Thai
-	USB_LANGID_TURKISH					= 0x041f,	// Turkish
-	USB_LANGID_UKRAINIAN				= 0x0422,	// Ukrainian
-	USB_LANGID_URDU_PAKISTAN			= 0x0420,	// Urdu (Pakistan)
-	USB_LANGID_URDU_INDIA				= 0x0820,	// Urdu (India)
-	USB_LANGID_UZBEK_LATIN				= 0x0443,	// Uzbek (Latin)
-	USB_LANGID_UZBEK_CYRILLIC			= 0x0843,	// Uzbek (Cyrillic)
-	USB_LANGID_VIETNAMESE				= 0x042a,	// Vietnamese
-
-	USB_LANGID_HID_UDD					= 0x04ff,	// HID (Usage Data Descriptor)
-	USB_LANGID_HID1						= 0xf0ff,	// HID (Vendor Defined 1)
-	USB_LANGID_HID2						= 0xf4ff,	// HID (Vendor Defined 2)
-	USB_LANGID_HID3						= 0xf8ff,	// HID (Vendor Defined 3)
-	USB_LANGID_HID4						= 0xfcff,	// HID (Vendor Defined 4)
+	USB_LANGID_AFRIKAANS				= 0x0436,	/* Afrikaans */
+	USB_LANGID_ALBANIAN					= 0x041c,	/* Albanian */
+	USB_LANGID_ARABIC_SAUDI_ARABIA		= 0x0401,	/* Arabic (Saudi Arabia) */
+	USB_LANGID_ARABIC_IRAK				= 0x0801,	/* Arabic (Irak) */
+	USB_LANGID_ARABIC_EGYPT				= 0x0c01,	/* Arabic (Egypt) */
+	USB_LANGID_ARABIC_LYBYA				= 0x1001,	/* Arabic (Libya) */
+	USB_LANGID_ARABIC_ALGERIA			= 0x1401,	/* Arabic (Algeria) */
+	USB_LANGID_ARABIC_MOROCCO			= 0x1801,	/* Arabic (Morocco) */
+	USB_LANGID_ARABIC_TUNISIA			= 0x1c01,	/* Arabic (Tunisia) */
+	USB_LANGID_ARABIC_OMAN				= 0x2001,	/* Arabic (Oman) */
+	USB_LANGID_ARABIC_YEMEN				= 0x2401,	/* Arabic (Yemen) */
+	USB_LANGID_ARABIC_SYRIA				= 0x2801,	/* Arabic (Syria) */
+	USB_LANGID_ARABIC_JORDAN			= 0x2c01,	/* Arabic (Jordan) */
+	USB_LANGID_ARABIC_LEBANON			= 0x3001,	/* Arabic (Lebanon) */
+	USB_LANGID_ARABIC_KUWAIT			= 0x3401,	/* Arabic (Kuwait) */
+	USB_LANGID_ARABIC_UAE				= 0x3801,	/* Arabic (U.A.E.) */
+	USB_LANGID_ARABIC_BAHRAIN			= 0x3c01,	/* Arabic (Bahrain) */
+	USB_LANGID_ARABIC_QATAR				= 0x4001,	/* Arabic (Qatar) */
+	USB_LANGID_ARMENIAN					= 0x042b,	/* Armenian */
+	USB_LANGID_ASSAMESE					= 0x044d,	/* Assamese */
+	USB_LANGID_AZERI_LATIN				= 0x042c,	/* Azeri (Latin) */
+	USB_LANGID_AZERI_CYRILLIC			= 0x082c,	/* Azeri (Cyrillic) */
+	USB_LANGID_BASQUE					= 0x042d,	/* Basque */
+	USB_LANGID_BELARUSSIAN				= 0x0423,	/* Belarussian */
+	USB_LANGID_BENGALI					= 0x0445,	/* Bengali */
+	USB_LANGID_BULGARIAN				= 0x0402,	/* Bulgarian */
+	USB_LANGID_BURMESE					= 0x0455,	/* Burmese */
+	USB_LANGID_CATALAN					= 0x0403,	/* Catalan */
+	USB_LANGID_CHINESE_TAIWAN			= 0x0404,	/* Chinese (Taiwan) */
+	USB_LANGID_CHINESE_PRC				= 0x0804,	/* Chinese (PRC = People Republic of Chinese) */
+	USB_LANGID_CHINESE_HONG_KONG		= 0x0c04,	/* Chinese (Hong Kong) */
+	USB_LANGID_CHINESE_SINGAPORE		= 0x1004,	/* Chinese (Singapore) */
+	USB_LANGID_CHINESE_MACAU_SAR		= 0x1404,	/* Chinese (Macau SAR) */
+	USB_LANGID_CROATIAN					= 0x041a,	/* Croatian */
+	USB_LANGID_CZECH					= 0x0405,	/* Czech */
+	USB_LANGID_DANISH					= 0x0406,	/* Danish */
+	USB_LANGID_DUTCH_NETHERLANDS		= 0x0413,	/* Dutch (Netherlands) */
+	USB_LANGID_DUTCH_BELGIUM			= 0x0813,	/* Dutch (Belgium) */
+	USB_LANGID_ENGLISH_UNITED_STATES	= 0x0409,	/* English (United States)	 */
+	USB_LANGID_ENGLISH_UNITED_KINGDOM	= 0x0809,	/* English (United Kingdom)	 */
+	USB_LANGID_ENGLISH_AUSTRALIAN		= 0x0c09,	/* English (Australian)	 */
+	USB_LANGID_ENGLISH_CANADIAN			= 0x1009,	/* English (Canadian)	 */
+	USB_LANGID_ENGLISH_NEW_ZEALAND		= 0x1409,	/* English (New Zealand)	 */
+	USB_LANGID_ENGLISH_IRELAND			= 0x1809,	/* English (Ireland)	 */
+	USB_LANGID_ENGLISH_SOUTH_AFRICA		= 0x1c09,	/* English (South Africa)	 */
+	USB_LANGID_ENGLISH_JAMAICA			= 0x2009,	/* English (Jamaica)	 */
+	USB_LANGID_ENGLISH_CARIBBEAN		= 0x2409,	/* English (Caribbean)	 */
+	USB_LANGID_ENGLISH_BELIZE			= 0x2809,	/* English (Belize)	 */
+	USB_LANGID_ENGLISH_TRINIDAD			= 0x2c09,	/* English (Trinidad)	 */
+	USB_LANGID_ENGLISH_ZIMBABWE			= 0x3009,	/* English (Zimbabwe)	 */
+	USB_LANGID_ENGLISH_PHLIPPINES		= 0x3409,	/* English (Philippines)	 */
+	USB_LANGID_ESTONIAN					= 0x0425,	/* Estonian */
+	USB_LANGID_FAEROESE					= 0x0438,	/* Faeroese */
+	USB_LANGID_FARSI					= 0x0429,	/* Farsi */
+	USB_LANGID_FINNISH					= 0x040b,	/* Finnish */
+	USB_LANGID_FRENCH_STANDARD			= 0x040c,	/* French (Standard) */
+	USB_LANGID_FRENCH_BELGIAN			= 0x080c,	/* French (Belgian) */
+	USB_LANGID_FRENCH_CANADIAN			= 0x0c0c,	/* French (Canadian) */
+	USB_LANGID_FRENCH_SWITZERLAND		= 0x100c,	/* French (Switzerland) */
+	USB_LANGID_FRENCH_LUXEMBOURG		= 0x140c,	/* French (Luxembourg) */
+	USB_LANGID_FRENCH_MONACO			= 0x180c,	/* French (Monaco) */
+	USB_LANGID_GEORGIAN					= 0x0437,	/* Georgian */
+	USB_LANGID_GERMAN_STANDARD			= 0x0407,	/* German (Standard) */
+	USB_LANGID_GERMAN_SWITZERLAND		= 0x0807,	/* German (Switzerland) */
+	USB_LANGID_GERMAN_AUSTRIA			= 0x0c07,	/* German (Austria) */
+	USB_LANGID_GERMAN_LUXEMBOURG		= 0x1007,	/* German (Luxembourg) */
+	USB_LANGID_GERMAN_LIECHTENSTEIN		= 0x1407,	/* German (Liechtenstein) */
+	USB_LANGID_GREEK					= 0x0408,	/* Greek */
+	USB_LANGID_GUJARATI					= 0x0447,	/* Gujarati */
+	USB_LANGID_HEBREW					= 0x040d,	/* Hebrew */
+	USB_LANGID_HINDI					= 0x0439,	/* Hindi */
+	USB_LANGID_HUNGARIAN				= 0x040e,	/* Hungarian */
+	USB_LANGID_ICELANDIC				= 0x040f,	/* Icelandic */
+	USB_LANGID_INDONESIAN				= 0x0421,	/* Indonesian */
+	USB_LANGID_ITALIAN_STANDARD			= 0x0410,	/* Italian (Standard) */
+	USB_LANGID_ITALIAN_SWITZERLAND		= 0x0810,	/* Italian (Switzerland) */
+	USB_LANGID_JAPANESE					= 0x0411,	/* Japanese */
+	USB_LANGID_KANNADA					= 0x044b,	/* Kannada */
+	USB_LANGID_KASHMIRI_INDIA			= 0x0860,	/* Kashmiri (India) */
+	USB_LANGID_KAZAKH					= 0x043f,	/* Kazakh */
+	USB_LANGID_KONKANI					= 0x0457,	/* Konkani */
+	USB_LANGID_KOREAN_JOHAB				= 0x0412,	/* Korean (Johab) */
+	USB_LANGID_LATVIAN					= 0x0426,	/* Latvian */
+	USB_LANGID_LITHUANIAN				= 0x0427,	/* Lithuanian */
+	USB_LANGID_LITHUANIAN_CLASSIC		= 0x0827,	/* Lithuanian (Classic) */
+	USB_LANGID_MACEDONIAN				= 0x042f,	/* Macedonian */
+	USB_LANGID_MALAY_MALAYSIAN			= 0x043e,	/* Malay (Malaysian) */
+	USB_LANGID_MALAY_BRUNEI_DARUSSALAM	= 0x083e,	/* Malay (Brunei Darussalam) */
+	USB_LANGID_MALAYALAM				= 0x044c,	/* Malayalam */
+	USB_LANGID_MANIPURI					= 0x0458,	/* Manipuri */
+	USB_LANGID_MARATHI					= 0x044e,	/* Marathi */
+	USB_LANGID_NEPALI_INDIA				= 0x0861,	/* Nepali (India) */
+	USB_LANGID_NORWEGIAN_BOKMAL			= 0x0414,	/* Norwegian (Bokmal) */
+	USB_LANGID_NORWEGIAN_NYNORSK		= 0x0814,	/* Norwegian (Nynorsk) */
+	USB_LANGID_ORIYA					= 0x0448,	/* Oriya */
+	USB_LANGID_POLISH					= 0x0415,	/* Polish */
+	USB_LANGID_PORTUGUESE_BRAZIL		= 0x0416,	/* Portuguese (Brazil) */
+	USB_LANGID_PORTUGUESE_STANDARD		= 0x0816,	/* Portuguese (Standard) */
+	USB_LANGID_PUNJABI					= 0x0446,	/* Punjabi */
+	USB_LANGID_ROMANIAN					= 0x0418,	/* Romanian */
+	USB_LANGID_RUSSIAN					= 0x0419,	/* Russian */
+	USB_LANGID_SANSKRIT					= 0x044f,	/* Sanskrit */
+	USB_LANGID_SERBIAN_CYRILLIC			= 0x0c1a,	/* Serbian (Cyrillic) */
+	USB_LANGID_SERBIAN_LATIN			= 0x081a,	/* Serbian (Latin) */
+	USB_LANGID_SINDHI					= 0x0459,	/* Sindhi */
+	USB_LANGID_SLOVAK					= 0x041b,	/* Slovak */
+	USB_LANGID_SLOVENIAN				= 0x0424,	/* Slovenian */
+	USB_LANGID_SPANNISH_TRADITIONAL_SORT= 0x040a,	/* Spannish (Traditional Sort) */
+	USB_LANGID_SPANNISH_MEXICAN			= 0x080a,	/* Spannish (Mexican) */
+	USB_LANGID_SPANNISH_MODERN_SORT		= 0x0c0a,	/* Spannish (Modern Sort) */
+	USB_LANGID_SPANNISH_GUATEMALA		= 0x100a,	/* Spannish (Guatemala) */
+	USB_LANGID_SPANNISH_COSTA_RICA		= 0x140a,	/* Spannish (Costa Rica) */
+	USB_LANGID_SPANNISH_PANAMA			= 0x180a,	/* Spannish (Panama) */
+	USB_LANGID_SPANNISH_DOMINICAN_REPUBLIC	= 0x1c0a,	/* Spannish (Dominican Republic) */
+	USB_LANGID_SPANNISH_VENEZUELA		= 0x200a,	/* Spannish (Venezuela) */
+	USB_LANGID_SPANNISH_COLOMBIA		= 0x240a,	/* Spannish (Colombia) */
+	USB_LANGID_SPANNISH_PERU			= 0x280a,	/* Spannish (Peru) */
+	USB_LANGID_SPANNISH_ARGENTINA		= 0x2c0a,	/* Spannish (Argentina) */
+	USB_LANGID_SPANNISH_ECUADOR			= 0x300a,	/* Spannish (Ecuador) */
+	USB_LANGID_SPANNISH_CHILE			= 0x340a,	/* Spannish (Chile) */
+	USB_LANGID_SPANNISH_URUGUAY			= 0x380a,	/* Spannish (Uruguay) */
+	USB_LANGID_SPANNISH_PARAGUAY		= 0x3c0a,	/* Spannish (Paraguay) */
+	USB_LANGID_SPANNISH_BOLIVIA			= 0x400a,	/* Spannish (Bolivia) */
+	USB_LANGID_SPANNISH_EL_SALVADOR		= 0x440a,	/* Spannish (El Salvador) */
+	USB_LANGID_SPANNISH_HONDURAS		= 0x480a,	/* Spannish (Honduras) */
+	USB_LANGID_SPANNISH_NICARAGUA		= 0x4c0a,	/* Spannish (Nicaragua) */
+	USB_LANGID_SPANNISH_PUERTO_RICO		= 0x500a,	/* Spannish (Puerto Rico) */
+	USB_LANGID_SUTU						= 0x0430,	/* Sutu */
+	USB_LANGID_SWAHILI_KENYA			= 0x0441,	/* Swahili (Kenya) */
+	USB_LANGID_SWEDISH					= 0x041d,	/* Swedish */
+	USB_LANGID_SWEDISH_FINLAND			= 0x081d,	/* Swedish (Finland) */
+	USB_LANGID_TAMIL					= 0x0449,	/* Tamil */
+	USB_LANGID_TATAR_TATARSTAN			= 0x0444,	/* Tatar (Tatarstan) */
+	USB_LANGID_TELUGU					= 0x044a,	/* Telugu */
+	USB_LANGID_THAI						= 0x041e,	/* Thai */
+	USB_LANGID_TURKISH					= 0x041f,	/* Turkish */
+	USB_LANGID_UKRAINIAN				= 0x0422,	/* Ukrainian */
+	USB_LANGID_URDU_PAKISTAN			= 0x0420,	/* Urdu (Pakistan) */
+	USB_LANGID_URDU_INDIA				= 0x0820,	/* Urdu (India) */
+	USB_LANGID_UZBEK_LATIN				= 0x0443,	/* Uzbek (Latin) */
+	USB_LANGID_UZBEK_CYRILLIC			= 0x0843,	/* Uzbek (Cyrillic) */
+	USB_LANGID_VIETNAMESE				= 0x042a,	/* Vietnamese */
 
-	USB_LANGID_INVALID					= 0x0000	// Invalid LANG ID
+	USB_LANGID_HID_UDD					= 0x04ff,	/* HID (Usage Data Descriptor) */
+	USB_LANGID_HID1						= 0xf0ff,	/* HID (Vendor Defined 1) */
+	USB_LANGID_HID2						= 0xf4ff,	/* HID (Vendor Defined 2) */
+	USB_LANGID_HID3						= 0xf8ff,	/* HID (Vendor Defined 3) */
+	USB_LANGID_HID4						= 0xfcff,	/* HID (Vendor Defined 4) */
+
+	USB_LANGID_INVALID					= 0x0000	/* Invalid LANG ID */
 };
 
-#endif	// USB_LANGIDS_H
+#endif	/* USB_LANGIDS_H */
 
-
+
Index: drivers/pcmcia/k_compat.h
===================================================================
--- drivers/pcmcia/k_compat.h	(revision 28851)
+++ drivers/pcmcia/k_compat.h	(working copy)
@@ -73,7 +73,7 @@
 
 /* Virtual memory mapping: this is somewhat inelegant, but lets us
    use drop-in replacements for the Linux equivalents */
-// #define PAGE_SIZE		(0x1000)
+/* #define PAGE_SIZE		(0x1000) */
 static inline void *ioremap(u_long base, u_long size)
 {
     char tag[B_OS_NAME_LENGTH];
@@ -182,9 +182,9 @@
 /* Interrupt handling */
 #define request_irq(i,h,f,n,d)	install_io_interrupt_handler(i,h,d,0)
 #define free_irq(i,h)	remove_io_interrupt(i,h)
-//#define REQUEST_IRQ(i,h,f,n,d)	install_io_interrupt_handler(i,h,d,0)
-//#define FREE_IRQ(i,h,d)		remove_io_interrupt(i,h)
-//#define IRQ(i,d,r)		(d)
+/*#define REQUEST_IRQ(i,h,f,n,d)	install_io_interrupt_handler(i,h,d,0) */
+/*#define FREE_IRQ(i,h,d)		remove_io_interrupt(i,h) */
+/*#define IRQ(i,d,r)		(d) */
 #define IRQ
 #define DEV_ID			dev_id
 #define NR_IRQS			16
Index: drivers/pcmcia/config.h
===================================================================
--- drivers/pcmcia/config.h	(revision 28851)
+++ drivers/pcmcia/config.h	(working copy)
@@ -8,6 +8,6 @@
 #define CONFIG_PCI 1
 #define CONFIG_CARDBUS 1
 #undef PCMCIA_DEBUG
-//#define PCMCIA_DEBUG 10
+/*#define PCMCIA_DEBUG 10 */
 
 #endif /* _PCMCIA_CONFIG_H */
Index: drivers/pcmcia/cs.h
===================================================================
--- drivers/pcmcia/cs.h	(revision 28851)
+++ drivers/pcmcia/cs.h	(working copy)
@@ -444,16 +444,16 @@
     bus_manager_info	binfo;
     int (*_CardServices)(int, ...);
     int (*_MTDHelperEntry)(int, ...);
- //   void (*_add_timer)(struct timer_list *);
- //   void (*_del_timer)(struct timer_list *);
+ /*   void (*_add_timer)(struct timer_list *); */
+ /*   void (*_del_timer)(struct timer_list *); */
 } cs_client_module_info;
 #define CS_SOCKET_MODULE_NAME "bus_managers/pcmcia_cs/socket/v1"
 typedef struct cs_socket_module_info {
     bus_manager_info	binfo;
     int (*_register_ss_entry)(int, ss_entry_t);
     void (*_unregister_ss_entry)(ss_entry_t);
- //   void (*_add_timer)(struct timer_list *);
- //   void (*_del_timer)(struct timer_list *);
+ /*   void (*_add_timer)(struct timer_list *); */
+ /*   void (*_del_timer)(struct timer_list *); */
     int (*register_resource)(int, u_long, u_long);
     int (*release_resource)(int, u_long, u_long);
     int (*check_resource)(int, u_long, u_long);
Index: drivers/Select.h
===================================================================
--- drivers/Select.h	(revision 28851)
+++ drivers/Select.h	(working copy)
@@ -13,11 +13,11 @@
 typedef struct selectsync selectsync;
 
 enum select_events {
-	B_SELECT_READ = 1,			// standard select() support
+	B_SELECT_READ = 1,			/* standard select() support */
 	B_SELECT_WRITE,
 	B_SELECT_ERROR,
 
-	B_SELECT_PRI_READ,			// additional poll() support
+	B_SELECT_PRI_READ,			/* additional poll() support */
 	B_SELECT_PRI_WRITE,
 
 	B_SELECT_HIGH_PRI_READ,
