CVS commit: src/sys/arch/epoc32/include

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:25:14 UTC 2020

Modified Files:
src/sys/arch/epoc32/include: intr.h

Log Message:
unifdef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/include/intr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/epoc32/include/intr.h
diff -u src/sys/arch/epoc32/include/intr.h:1.1 src/sys/arch/epoc32/include/intr.h:1.2
--- src/sys/arch/epoc32/include/intr.h:1.1	Sun Apr 28 12:11:26 2013
+++ src/sys/arch/epoc32/include/intr.h	Thu Jul 23 19:25:14 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.1 2013/04/28 12:11:26 kiyohara Exp $	*/
+/*	$NetBSD: intr.h,v 1.2 2020/07/23 19:25:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -66,21 +66,11 @@
 
 #include 
 
-#if defined(_LKM)
-
-int	_splraise(int);
-int	_spllower(int);
-void	splx(int);
-
-#else	/* _LKM */
-
 #define PIC_MAXSOURCES		16
 #define PIC_MAXMAXSOURCES	16
 
 #include 
 
-#endif /* _LKM */
-
 #define	splsoft()	_splraise(IPL_SOFT)
 
 typedef uint8_t ipl_t;

CVS commit: src/sys/arch/epoc32/include

[KIYOHARA Takashi]

Module Name:src
Committed By:   kiyohara
Date:   Thu Jun 20 13:38:03 UTC 2013

Modified Files:
src/sys/arch/epoc32/include: bootinfo.h

Log Message:
Support boot argument for kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/include/bootinfo.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/epoc32/include/bootinfo.h
diff -u src/sys/arch/epoc32/include/bootinfo.h:1.1 src/sys/arch/epoc32/include/bootinfo.h:1.2
--- src/sys/arch/epoc32/include/bootinfo.h:1.1	Sun Apr 28 12:11:25 2013
+++ src/sys/arch/epoc32/include/bootinfo.h	Thu Jun 20 13:38:03 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootinfo.h,v 1.1 2013/04/28 12:11:25 kiyohara Exp $	*/
+/*	$NetBSD: bootinfo.h,v 1.2 2013/06/20 13:38:03 kiyohara Exp $	*/
 /*
  * Copyright (c) 2012 KIYOHARA Takashi
  * All rights reserved.
@@ -40,6 +40,7 @@ struct btinfo_common {
 #define BTINFO_MODEL	1
 #define BTINFO_MEMORY	2
 #define BTINFO_VIDEO	3
+#define BTINFO_BOOTARGS	4
 
 #define BTINFO_MAX_SIZE	512
 
@@ -60,6 +61,11 @@ struct btinfo_video {
 	int width;
 	int height;
 };
+
+struct btinfo_bootargs {
+	struct btinfo_common common;
+	char bootargs[256];
+};
 #endif	/* _LOCORE */
 
 #endif	/* _EPOC32_BOOTINFO_H_ */