Include <dev/ic/comreg.h> for COM_FREQ.diff -r1.3 -r1.4 src/sys/arch/evbppc/include/obs200.h
(rin)
--- src/sys/arch/evbppc/include/obs200.h 2021/03/30 03:45:34 1.3
+++ src/sys/arch/evbppc/include/obs200.h 2021/03/30 04:08:02 1.4
@@ -1,50 +1,52 @@ | @@ -1,50 +1,52 @@ | |||
1 | /* $NetBSD: obs200.h,v 1.3 2021/03/30 03:45:34 rin Exp $ */ | 1 | /* $NetBSD: obs200.h,v 1.4 2021/03/30 04:08:02 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright 2004 Shigeyuki Fukushima. | 4 | * Copyright 2004 Shigeyuki Fukushima. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Written by Shigeyuki Fukushima for The NetBSD Project. | 7 | * Written by Shigeyuki Fukushima for The NetBSD Project. | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright | |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. | |
14 | * 2. Redistributions in binary form must reproduce the above | 14 | * 2. Redistributions in binary form must reproduce the above | |
15 | * copyright notice, this list of conditions and the following | 15 | * copyright notice, this list of conditions and the following | |
16 | * disclaimer in the documentation and/or other materials provided | 16 | * disclaimer in the documentation and/or other materials provided | |
17 | * with the distribution. | 17 | * with the distribution. | |
18 | * 3. The name of the author may not be used to endorse or promote | 18 | * 3. The name of the author may not be used to endorse or promote | |
19 | * products derived from this software without specific prior | 19 | * products derived from this software without specific prior | |
20 | * written permission. | 20 | * written permission. | |
21 | * | 21 | * | |
22 | * THIS SOFTWARE IS PROVIDED THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 22 | * THIS SOFTWARE IS PROVIDED THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | |
24 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 24 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
25 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE | 25 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE | |
26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
27 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT | 27 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT | |
28 | * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 28 | * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
29 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | 29 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | |
30 | * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 30 | * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
31 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE | 31 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE | |
32 | * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | 32 | * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | |
33 | * DAMAGE. | 33 | * DAMAGE. | |
34 | */ | 34 | */ | |
35 | 35 | |||
36 | #ifndef _EVBPPC_OBS200_H_ | 36 | #ifndef _EVBPPC_OBS200_H_ | |
37 | #define _EVBPPC_OBS200_H_ | 37 | #define _EVBPPC_OBS200_H_ | |
38 | 38 | |||
39 | #include <dev/ic/comreg.h> | |||
40 | ||||
39 | /* | 41 | /* | |
40 | * Device Properties for OpenBlockS S/R (IBM405GP 200MHz) | 42 | * Device Properties for OpenBlockS S/R (IBM405GP 200MHz) | |
41 | */ | 43 | */ | |
42 | 44 | |||
43 | /* UART Clock */ | 45 | /* UART Clock */ | |
44 | #define OBS200_COM_FREQ (COM_FREQ * 4) /* UART CLK 7.3728 MHz */ | 46 | #define OBS200_COM_FREQ (COM_FREQ * 4) /* UART CLK 7.3728 MHz */ | |
45 | 47 | |||
46 | /* | 48 | /* | |
47 | * extern variables and functions | 49 | * extern variables and functions | |
48 | */ | 50 | */ | |
49 | 51 | |||
50 | #endif /* _EVBPPC_OBS200_H_ */ | 52 | #endif /* _EVBPPC_OBS200_H_ */ |
--- src/sys/arch/evbppc/include/obs266.h 2021/03/30 03:45:34 1.3
+++ src/sys/arch/evbppc/include/obs266.h 2021/03/30 04:08:02 1.4
@@ -1,62 +1,64 @@ | @@ -1,62 +1,64 @@ | |||
1 | /* $NetBSD: obs266.h,v 1.3 2021/03/30 03:45:34 rin Exp $ */ | 1 | /* $NetBSD: obs266.h,v 1.4 2021/03/30 04:08:02 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright 2004 Shigeyuki Fukushima. | 4 | * Copyright 2004 Shigeyuki Fukushima. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Written by Shigeyuki Fukushima for The NetBSD Project. | 7 | * Written by Shigeyuki Fukushima for The NetBSD Project. | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright | |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. | |
14 | * 2. Redistributions in binary form must reproduce the above | 14 | * 2. Redistributions in binary form must reproduce the above | |
15 | * copyright notice, this list of conditions and the following | 15 | * copyright notice, this list of conditions and the following | |
16 | * disclaimer in the documentation and/or other materials provided | 16 | * disclaimer in the documentation and/or other materials provided | |
17 | * with the distribution. | 17 | * with the distribution. | |
18 | * 3. The name of the author may not be used to endorse or promote | 18 | * 3. The name of the author may not be used to endorse or promote | |
19 | * products derived from this software without specific prior | 19 | * products derived from this software without specific prior | |
20 | * written permission. | 20 | * written permission. | |
21 | * | 21 | * | |
22 | * THIS SOFTWARE IS PROVIDED THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 22 | * THIS SOFTWARE IS PROVIDED THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | |
24 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 24 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
25 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE | 25 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE | |
26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
27 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT | 27 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT | |
28 | * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 28 | * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
29 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | 29 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | |
30 | * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 30 | * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
31 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE | 31 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE | |
32 | * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | 32 | * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | |
33 | * DAMAGE. | 33 | * DAMAGE. | |
34 | */ | 34 | */ | |
35 | 35 | |||
36 | #ifndef _EVBPPC_OBS266_H_ | 36 | #ifndef _EVBPPC_OBS266_H_ | |
37 | #define _EVBPPC_OBS266_H_ | 37 | #define _EVBPPC_OBS266_H_ | |
38 | 38 | |||
39 | #include <dev/ic/comreg.h> | |||
40 | ||||
39 | /* | 41 | /* | |
40 | * Device Properties for OpenBlockS266 (IBM405GPr 266MHz) | 42 | * Device Properties for OpenBlockS266 (IBM405GPr 266MHz) | |
41 | */ | 43 | */ | |
42 | 44 | |||
43 | /* UART Clock */ | 45 | /* UART Clock */ | |
44 | #define OBS266_COM_FREQ (COM_FREQ * 4) /* UART CLK 7.3728 MHz */ | 46 | #define OBS266_COM_FREQ (COM_FREQ * 4) /* UART CLK 7.3728 MHz */ | |
45 | 47 | |||
46 | /* OpenBlockS266 GPIO LED */ | 48 | /* OpenBlockS266 GPIO LED */ | |
47 | #define OBS266_LED1 (1) | 49 | #define OBS266_LED1 (1) | |
48 | #define OBS266_LED2 (2) | 50 | #define OBS266_LED2 (2) | |
49 | #define OBS266_LED4 (4) | 51 | #define OBS266_LED4 (4) | |
50 | #define OBS266_LED_ON (OBS266_LED1 | OBS266_LED2 | OBS266_LED4) | 52 | #define OBS266_LED_ON (OBS266_LED1 | OBS266_LED2 | OBS266_LED4) | |
51 | #define OBS266_LED_OFF (~OBS266_LED1 & ~OBS266_LED2 & ~OBS266_LED4) | 53 | #define OBS266_LED_OFF (~OBS266_LED1 & ~OBS266_LED2 & ~OBS266_LED4) | |
52 | 54 | |||
53 | #define OBS266_GPIO_LED1 (12) | 55 | #define OBS266_GPIO_LED1 (12) | |
54 | #define OBS266_GPIO_LED2 (13) | 56 | #define OBS266_GPIO_LED2 (13) | |
55 | #define OBS266_GPIO_LED4 (14) | 57 | #define OBS266_GPIO_LED4 (14) | |
56 | 58 | |||
57 | /* | 59 | /* | |
58 | * extern variables and functions | 60 | * extern variables and functions | |
59 | */ | 61 | */ | |
60 | extern void obs266_led_set(int led); | 62 | extern void obs266_led_set(int led); | |
61 | 63 | |||
62 | #endif /* _EVBPPC_OBS266_H_ */ | 64 | #endif /* _EVBPPC_OBS266_H_ */ |
--- src/sys/arch/evbppc/include/obs600.h 2021/03/30 03:45:34 1.2
+++ src/sys/arch/evbppc/include/obs600.h 2021/03/30 04:08:02 1.3
@@ -1,38 +1,40 @@ | @@ -1,38 +1,40 @@ | |||
1 | /* $NetBSD: obs600.h,v 1.2 2021/03/30 03:45:34 rin Exp $ */ | 1 | /* $NetBSD: obs600.h,v 1.3 2021/03/30 04:08:02 rin Exp $ */ | |
2 | /* | 2 | /* | |
3 | * Copyright (c) 2009 KIYOHARA Takashi | 3 | * Copyright (c) 2009 KIYOHARA Takashi | |
4 | * All rights reserved. | 4 | * All rights reserved. | |
5 | * | 5 | * | |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions | |
8 | * are met: | 8 | * are met: | |
9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. | |
11 | * 2. Redistributions in binary form must reproduce the above copyright | 11 | * 2. Redistributions in binary form must reproduce the above copyright | |
12 | * notice, this list of conditions and the following disclaimer in the | 12 | * notice, this list of conditions and the following disclaimer in the | |
13 | * documentation and/or other materials provided with the distribution. | 13 | * documentation and/or other materials provided with the distribution. | |
14 | * | 14 | * | |
15 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 15 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | |
17 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 17 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | |
18 | * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, | 18 | * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, | |
19 | * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 19 | * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | |
20 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | 20 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | |
21 | * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 21 | * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
22 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | 22 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |
23 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN | 23 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN | |
24 | * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 24 | * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
25 | * POSSIBILITY OF SUCH DAMAGE. | 25 | * POSSIBILITY OF SUCH DAMAGE. | |
26 | */ | 26 | */ | |
27 | 27 | |||
28 | #ifndef _EVBPPC_OBS600_H_ | 28 | #ifndef _EVBPPC_OBS600_H_ | |
29 | #define _EVBPPC_OBS600_H_ | 29 | #define _EVBPPC_OBS600_H_ | |
30 | 30 | |||
31 | #include <dev/ic/comreg.h> | |||
32 | ||||
31 | /* | 33 | /* | |
32 | * Device Properties for OpenBlockS600 (AMCC 405EX 600MHz) | 34 | * Device Properties for OpenBlockS600 (AMCC 405EX 600MHz) | |
33 | */ | 35 | */ | |
34 | 36 | |||
35 | /* UART Clock */ | 37 | /* UART Clock */ | |
36 | #define OBS600_COM_FREQ (COM_FREQ * 4) /* UART CLK 7.3728 MHz */ | 38 | #define OBS600_COM_FREQ (COM_FREQ * 4) /* UART CLK 7.3728 MHz */ | |
37 | 39 | |||
38 | #endif /* _EVBPPC_OBS600_H_ */ | 40 | #endif /* _EVBPPC_OBS600_H_ */ |