simarm: Refactor include files · jcs.org/pce@459dd0a

+3 -102

Makefile.dep

··· 1114 1114 src/arch/simarm/intc.h \ 1115 1115 src/arch/simarm/main.h \ 1116 1116 src/arch/simarm/pci.h \ 1117 - src/arch/simarm/sercons.h \ 1118 1117 src/arch/simarm/simarm.h \ 1119 1118 src/arch/simarm/timer.h \ 1120 1119 src/chipset/82xx/e8250.h \ ··· 1131 1130 src/lib/brkpt.h \ 1132 1131 src/lib/cmd.h \ 1133 1132 src/lib/console.h \ 1134 - src/lib/iniata.h \ 1135 - src/lib/inidsk.h \ 1136 - src/lib/iniram.h \ 1137 - src/lib/load.h \ 1138 1133 src/lib/log.h \ 1139 - src/lib/monitor.h \ 1140 - src/lib/msg.h \ 1141 1134 src/lib/sysdep.h \ 1142 1135 src/libini/libini.h 1143 1136 1144 1137 src/arch/simarm/intc.o: src/arch/simarm/intc.c \ 1145 - src/arch/simarm/cmd_arm.h \ 1146 1138 src/arch/simarm/intc.h \ 1147 1139 src/arch/simarm/main.h \ 1148 - src/arch/simarm/pci.h \ 1149 - src/arch/simarm/sercons.h \ 1150 - src/arch/simarm/simarm.h \ 1151 - src/arch/simarm/timer.h \ 1152 - src/chipset/82xx/e8250.h \ 1153 1140 src/config.h \ 1154 - src/cpu/arm/arm.h \ 1155 - src/devices/ata.h \ 1156 1141 src/devices/memory.h \ 1157 - src/devices/nvram.h \ 1158 - src/devices/pci-ata.h \ 1159 - src/devices/pci.h \ 1160 - src/devices/serport.h \ 1161 - src/drivers/block/block.h \ 1162 - src/drivers/char/char.h \ 1163 - src/lib/brkpt.h \ 1164 - src/lib/cmd.h \ 1165 - src/lib/console.h \ 1166 - src/lib/iniata.h \ 1167 - src/lib/inidsk.h \ 1168 - src/lib/iniram.h \ 1169 - src/lib/load.h \ 1170 - src/lib/log.h \ 1171 - src/lib/monitor.h \ 1172 - src/lib/msg.h \ 1173 - src/lib/sysdep.h \ 1174 - src/libini/libini.h 1142 + src/lib/log.h 1175 1143 1176 1144 src/arch/simarm/main.o: src/arch/simarm/main.c \ 1177 1145 src/arch/simarm/cmd_arm.h \ 1178 1146 src/arch/simarm/intc.h \ 1179 1147 src/arch/simarm/main.h \ 1180 1148 src/arch/simarm/pci.h \ 1181 - src/arch/simarm/sercons.h \ 1182 1149 src/arch/simarm/simarm.h \ 1183 1150 src/arch/simarm/timer.h \ 1184 1151 src/chipset/82xx/e8250.h \ ··· 1195 1162 src/lib/brkpt.h \ 1196 1163 src/lib/cmd.h \ 1197 1164 src/lib/console.h \ 1198 - src/lib/iniata.h \ 1199 - src/lib/inidsk.h \ 1200 - src/lib/iniram.h \ 1201 - src/lib/load.h \ 1202 1165 src/lib/log.h \ 1203 1166 src/lib/monitor.h \ 1204 - src/lib/msg.h \ 1205 1167 src/lib/sysdep.h \ 1206 1168 src/libini/libini.h 1207 1169 1208 1170 src/arch/simarm/pci.o: src/arch/simarm/pci.c \ 1209 - src/arch/simarm/cmd_arm.h \ 1210 - src/arch/simarm/intc.h \ 1211 1171 src/arch/simarm/main.h \ 1212 1172 src/arch/simarm/pci.h \ 1213 - src/arch/simarm/sercons.h \ 1214 - src/arch/simarm/simarm.h \ 1215 - src/arch/simarm/timer.h \ 1216 - src/chipset/82xx/e8250.h \ 1217 1173 src/config.h \ 1218 - src/cpu/arm/arm.h \ 1219 - src/devices/ata.h \ 1220 1174 src/devices/memory.h \ 1221 - src/devices/nvram.h \ 1222 - src/devices/pci-ata.h \ 1223 1175 src/devices/pci.h \ 1224 - src/devices/serport.h \ 1225 - src/drivers/block/block.h \ 1226 - src/drivers/char/char.h \ 1227 - src/lib/brkpt.h \ 1228 - src/lib/cmd.h \ 1229 - src/lib/console.h \ 1230 - src/lib/iniata.h \ 1231 - src/lib/inidsk.h \ 1232 - src/lib/iniram.h \ 1233 - src/lib/load.h \ 1234 - src/lib/log.h \ 1235 - src/lib/monitor.h \ 1236 - src/lib/msg.h \ 1237 - src/lib/sysdep.h \ 1238 - src/libini/libini.h 1176 + src/lib/log.h 1239 1177 1240 1178 src/arch/simarm/sercons.o: src/arch/simarm/sercons.c \ 1241 - src/arch/simarm/cmd_arm.h \ 1242 1179 src/arch/simarm/intc.h \ 1243 1180 src/arch/simarm/main.h \ 1244 1181 src/arch/simarm/pci.h \ ··· 1258 1195 src/drivers/char/char.h \ 1259 1196 src/lib/brkpt.h \ 1260 1197 src/lib/cmd.h \ 1261 - src/lib/console.h \ 1262 - src/lib/iniata.h \ 1263 - src/lib/inidsk.h \ 1264 - src/lib/iniram.h \ 1265 - src/lib/load.h \ 1266 - src/lib/log.h \ 1267 - src/lib/monitor.h \ 1268 - src/lib/msg.h \ 1269 1198 src/lib/sysdep.h \ 1270 1199 src/libini/libini.h 1271 1200 1272 1201 src/arch/simarm/simarm.o: src/arch/simarm/simarm.c \ 1273 - src/arch/simarm/cmd_arm.h \ 1274 1202 src/arch/simarm/intc.h \ 1275 1203 src/arch/simarm/main.h \ 1276 1204 src/arch/simarm/pci.h \ ··· 1290 1218 src/drivers/char/char.h \ 1291 1219 src/lib/brkpt.h \ 1292 1220 src/lib/cmd.h \ 1293 - src/lib/console.h \ 1294 1221 src/lib/iniata.h \ 1295 1222 src/lib/inidsk.h \ 1296 1223 src/lib/iniram.h \ 1297 1224 src/lib/load.h \ 1298 1225 src/lib/log.h \ 1299 - src/lib/monitor.h \ 1300 1226 src/lib/msg.h \ 1301 1227 src/lib/sysdep.h \ 1302 1228 src/libini/libini.h 1303 1229 1304 1230 src/arch/simarm/timer.o: src/arch/simarm/timer.c \ 1305 - src/arch/simarm/cmd_arm.h \ 1306 - src/arch/simarm/intc.h \ 1307 1231 src/arch/simarm/main.h \ 1308 - src/arch/simarm/pci.h \ 1309 - src/arch/simarm/sercons.h \ 1310 - src/arch/simarm/simarm.h \ 1311 1232 src/arch/simarm/timer.h \ 1312 - src/chipset/82xx/e8250.h \ 1313 1233 src/config.h \ 1314 - src/cpu/arm/arm.h \ 1315 - src/devices/ata.h \ 1316 1234 src/devices/memory.h \ 1317 - src/devices/nvram.h \ 1318 - src/devices/pci-ata.h \ 1319 - src/devices/pci.h \ 1320 - src/devices/serport.h \ 1321 - src/drivers/block/block.h \ 1322 - src/drivers/char/char.h \ 1323 - src/lib/brkpt.h \ 1324 - src/lib/cmd.h \ 1325 - src/lib/console.h \ 1326 - src/lib/iniata.h \ 1327 - src/lib/inidsk.h \ 1328 - src/lib/iniram.h \ 1329 - src/lib/load.h \ 1330 - src/lib/log.h \ 1331 - src/lib/monitor.h \ 1332 - src/lib/msg.h \ 1333 - src/lib/sysdep.h \ 1334 - src/libini/libini.h 1235 + src/lib/log.h 1335 1236 1336 1237 src/arch/sims32/cmd_s32.o: src/arch/sims32/cmd_s32.c \ 1337 1238 src/arch/sims32/cmd_s32.h \

+41

src/arch/simarm/cmd_arm.c

··· 27 27 28 28 29 29 #include "main.h" 30 + #include "cmd_arm.h" 31 + #include "simarm.h" 32 + 33 + #include <cpu/arm/arm.h> 34 + 35 + #include <lib/console.h> 36 + #include <lib/log.h> 37 + #include <lib/sysdep.h> 30 38 31 39 32 40 static const char *arm_modes[32] = { ··· 213 221 { 214 222 pce_prt_sep ("ARM MEM"); 215 223 mem_prt_state (sim->mem, fp); 224 + } 225 + 226 + void prt_state (simarm_t *sim, FILE *fp, const char *str) 227 + { 228 + cmd_t cmd; 229 + 230 + cmd_set_str (&cmd, str); 231 + 232 + if (cmd_match_eol (&cmd)) { 233 + return; 234 + } 235 + 236 + while (!cmd_match_eol (&cmd)) { 237 + if (cmd_match (&cmd, "cpu")) { 238 + sarm_prt_state_cpu (sim->cpu, fp); 239 + } 240 + else if (cmd_match (&cmd, "mmu")) { 241 + sarm_prt_state_mmu (sim->cpu, fp); 242 + } 243 + else if (cmd_match (&cmd, "timer")) { 244 + sarm_prt_state_timer (sim->timer, fp); 245 + } 246 + else if (cmd_match (&cmd, "intc")) { 247 + sarm_prt_state_intc (sim, fp); 248 + } 249 + else if (cmd_match (&cmd, "mem")) { 250 + sarm_prt_state_mem (sim, fp); 251 + } 252 + else { 253 + printf ("unknown component (%s)\n", cmd_get_str (&cmd)); 254 + return; 255 + } 256 + } 216 257 } 217 258 218 259

+17 -1

src/arch/simarm/cmd_arm.h

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/cmd_arm.h * 7 7 * Created: 2004-11-04 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 26 26 *****************************************************************************/ 27 27 28 28 29 + #ifndef PCE_SIMARM_CMD_ARM_H 30 + #define PCE_SIMARM_CMD_ARM_H 1 31 + 32 + 33 + #include <stdio.h> 34 + 35 + #include "simarm.h" 36 + #include "timer.h" 37 + 38 + #include <cpu/arm/arm.h> 39 + 40 + 29 41 void sarm_dasm_str (char *dst, arm_dasm_t *op); 30 42 void sarm_prt_state_cpu (arm_t *c, FILE *fp); 31 43 void sarm_prt_state_mmu (arm_t *c, FILE *fp); 32 44 void sarm_prt_state_timer (ixp_timer_t *tmr, FILE *fp); 33 45 void sarm_prt_state_intc (simarm_t *sim, FILE *fp); 34 46 void sarm_prt_state_mem (simarm_t *sim, FILE *fp); 47 + void prt_state (simarm_t *sim, FILE *fp, const char *str); 35 48 36 49 void sarm_run (simarm_t *sim); 37 50 38 51 int sarm_do_cmd (simarm_t *sim, cmd_t *cmd); 39 52 40 53 void sarm_cmd_init (simarm_t *sim); 54 + 55 + 56 + #endif

+6 -1

src/arch/simarm/intc.c

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/intc.c * 7 7 * Created: 2004-11-13 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 27 27 28 28 29 29 #include "main.h" 30 + #include "intc.h" 31 + 32 + #include <stdlib.h> 33 + 34 + #include <lib/log.h> 30 35 31 36 32 37 static unsigned char ict_get_uint8 (ixp_intc_t *ic, unsigned long addr);

+9 -36

src/arch/simarm/main.c

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/main.c * 7 7 * Created: 2004-11-04 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2012 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 26 26 *****************************************************************************/ 27 27 28 28 29 - #include <config.h> 29 + #include "main.h" 30 + #include "cmd_arm.h" 31 + #include "simarm.h" 30 32 31 33 #include <stdio.h> 32 34 #include <stdlib.h> 33 35 #include <stdarg.h> 36 + #include <string.h> 34 37 35 38 #include <signal.h> 36 39 37 - #include "main.h" 40 + #include <lib/console.h> 41 + #include <lib/log.h> 42 + #include <lib/monitor.h> 43 + #include <lib/sysdep.h> 38 44 39 45 40 46 char *par_cpu = NULL; ··· 122 128 } 123 129 124 130 return (1); 125 - } 126 - 127 - void prt_state (simarm_t *sim, FILE *fp, const char *str) 128 - { 129 - cmd_t cmd; 130 - 131 - cmd_set_str (&cmd, str); 132 - 133 - if (cmd_match_eol (&cmd)) { 134 - return; 135 - } 136 - 137 - while (!cmd_match_eol (&cmd)) { 138 - if (cmd_match (&cmd, "cpu")) { 139 - sarm_prt_state_cpu (sim->cpu, fp); 140 - } 141 - else if (cmd_match (&cmd, "mmu")) { 142 - sarm_prt_state_mmu (sim->cpu, fp); 143 - } 144 - else if (cmd_match (&cmd, "timer")) { 145 - sarm_prt_state_timer (sim->timer, fp); 146 - } 147 - else if (cmd_match (&cmd, "intc")) { 148 - sarm_prt_state_intc (sim, fp); 149 - } 150 - else if (cmd_match (&cmd, "mem")) { 151 - sarm_prt_state_mem (sim, fp); 152 - } 153 - else { 154 - printf ("unknown component (%s)\n", cmd_get_str (&cmd)); 155 - return; 156 - } 157 - } 158 131 } 159 132 160 133 static

+2 -39

src/arch/simarm/main.h

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/main.h * 7 7 * Created: 2004-11-04 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2011 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 32 32 33 33 #include <config.h> 34 34 35 - #include <stdlib.h> 36 - #include <stdio.h> 37 - #include <string.h> 38 - 39 - #ifdef HAVE_UNISTD_H 40 - #include <unistd.h> 41 - #endif 42 - 43 - #include <lib/log.h> 44 - #include <lib/cmd.h> 45 - #include <lib/console.h> 46 - #include <lib/msg.h> 47 - #include <lib/monitor.h> 48 - #include <lib/iniata.h> 49 - #include <lib/inidsk.h> 50 - #include <lib/iniram.h> 51 - #include <lib/sysdep.h> 52 - 53 - #include <cpu/arm/arm.h> 54 - 55 - #include <devices/memory.h> 56 - #include <devices/pci.h> 57 - 58 - #include "intc.h" 59 - #include "pci.h" 60 - #include "simarm.h" 61 - #include "sercons.h" 62 - #include "cmd_arm.h" 63 - 64 - 65 - #define sarm_br16(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) 66 - #define sarm_br32(x) ((((x) & 0xff) << 24) | ((((x) >> 8) & 0xff) << 16) \ 67 - | ((((x) >> 16) & 0xff) << 8) | (((x) >> 24) & 0xff)) 68 - 69 35 70 36 extern int par_verbose; 71 37 72 38 extern unsigned par_xlat; 73 39 74 - extern simarm_t *par_sim; 40 + extern struct simarm_s *par_sim; 75 41 76 42 extern unsigned par_sig_int; 77 - 78 - 79 - void prt_state (simarm_t *sim, FILE *fp, const char *str); 80 43 81 44 82 45 #endif

+13 -1

src/arch/simarm/pci.c

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/pci.c * 7 7 * Created: 2004-11-16 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2010 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 27 27 28 28 29 29 #include "main.h" 30 + #include "pci.h" 31 + 32 + #include <stdlib.h> 33 + 34 + #include <devices/memory.h> 35 + #include <devices/pci.h> 36 + 37 + #include <lib/log.h> 30 38 31 39 32 40 /* #define DEBUG_PCI 1 */ 33 41 /* #define DEBUG_PCI_IXP 1 */ 42 + 43 + #define sarm_br16(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) 44 + #define sarm_br32(x) ((((x) & 0xff) << 24) | ((((x) >> 8) & 0xff) << 16) \ 45 + | ((((x) >> 16) & 0xff) << 8) | (((x) >> 24) & 0xff)) 34 46 35 47 36 48 static

+7 -1

src/arch/simarm/pci.h

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/pci.h * 7 7 * Created: 2004-11-16 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2010 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 28 28 29 29 #ifndef PCE_SIMARM_PCI_H 30 30 #define PCE_SIMARM_PCI_H 1 31 + 32 + 33 + #include <stdint.h> 34 + 35 + #include <devices/memory.h> 36 + #include <devices/pci.h> 31 37 32 38 33 39 #define PCIID_INTEL_IXP2400 0x9001

+6 -2

src/arch/simarm/sercons.c

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/sercons.c * 7 7 * Created: 2004-11-04 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 26 26 *****************************************************************************/ 27 27 28 28 29 + #include "main.h" 30 + #include "sercons.h" 31 + #include "simarm.h" 32 + 29 33 #include <stdio.h> 30 34 #include <stdlib.h> 31 35 #include <string.h> ··· 34 38 #include <fcntl.h> 35 39 #include <sys/types.h> 36 40 37 - #include "main.h" 41 + #include <lib/sysdep.h> 38 42 39 43 40 44 void scon_check (simarm_t *sim)

+4 -1

src/arch/simarm/sercons.h

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/sercons.h * 7 7 * Created: 2004-11-04 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 28 28 29 29 #ifndef PCE_SIMARM_SERCONS_H 30 30 #define PCE_SIMARM_SERCONS_H 1 31 + 32 + 33 + #include "simarm.h" 31 34 32 35 33 36 void scon_check (simarm_t *sim);

+15

src/arch/simarm/simarm.c

··· 27 27 28 28 29 29 #include "main.h" 30 + #include "intc.h" 31 + #include "pci.h" 32 + #include "sercons.h" 33 + #include "simarm.h" 30 34 #include "timer.h" 35 + 36 + #include <stdlib.h> 37 + #include <string.h> 38 + 39 + #include <lib/iniata.h> 40 + #include <lib/inidsk.h> 41 + #include <lib/iniram.h> 42 + #include <lib/load.h> 43 + #include <lib/log.h> 44 + #include <lib/msg.h> 45 + #include <lib/sysdep.h> 31 46 32 47 33 48 void sarm_break (simarm_t *sim, unsigned char val);

+2 -41

src/arch/simarm/simarm.h

··· 30 30 #define PCE_SIMARM_SIMARM_H 1 31 31 32 32 33 - #include <config.h> 34 - 35 - #include <stdlib.h> 36 33 #include <stdio.h> 37 - #include <string.h> 38 34 39 - #ifdef HAVE_LIMITS_H 40 - #include <limits.h> 41 - #endif 42 - 35 + #include "intc.h" 36 + #include "pci.h" 43 37 #include "timer.h" 44 38 45 - 46 - #define PCE_BRK_STOP 1 47 - #define PCE_BRK_ABORT 2 48 - #define PCE_BRK_SNAP 3 49 - 50 - 51 - typedef void (*seta_uint8_f) (void *ext, unsigned long addr, unsigned char val); 52 - typedef void (*seta_uint16_f) (void *ext, unsigned long addr, unsigned short val); 53 - typedef unsigned char (*geta_uint8_f) (void *ext, unsigned long addr); 54 - typedef unsigned short (*geta_uint16_f) (void *ext, unsigned long addr); 55 - 56 - typedef void (*set_uint8_f) (void *ext, unsigned char val); 57 - typedef void (*set_uint16_f) (void *ext, unsigned short val); 58 - typedef unsigned char (*get_uint8_f) (void *ext); 59 - typedef unsigned short (*get_uint16_f) (void *ext); 60 - 61 - 62 - struct simarm_t; 63 - 64 - 65 - extern char *par_terminal; 66 - extern char *par_video; 67 - extern char *par_cpu; 68 - 69 - 70 - void pce_dump_hex (FILE *fp, void *buf, unsigned long n, 71 - unsigned long addr, unsigned cols, char *prefix, int ascii 72 - ); 73 - 74 - 75 39 #include <devices/memory.h> 76 40 #include <devices/nvram.h> 77 41 #include <devices/serport.h> ··· 82 46 83 47 #include <libini/libini.h> 84 48 85 - #include <lib/log.h> 86 49 #include <lib/brkpt.h> 87 - #include <lib/inidsk.h> 88 - #include <lib/load.h> 89 50 90 51 91 52 /*****************************************************************************

+5 -1

src/arch/simarm/timer.c

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/timer.c * 7 7 * Created: 2004-11-14 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2011 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 28 28 29 29 #include "main.h" 30 30 #include "timer.h" 31 + 32 + #include <stdlib.h> 33 + 34 + #include <lib/log.h> 31 35 32 36 33 37 #define IXP_TIMER_ACT (1UL << 7)

+4 -1

src/arch/simarm/timer.h

··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/simarm/timer.h * 7 7 * Created: 2004-11-14 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2011 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2013 Hampa Hug <hampa@hampa.ch> * 9 9 * Copyright: (C) 2004-2006 Lukas Ruf <ruf@lpr.ch> * 10 10 *****************************************************************************/ 11 11 ··· 28 28 29 29 #ifndef PCE_SIMARM_TIMER_H 30 30 #define PCE_SIMARM_TIMER_H 1 31 + 32 + 33 + #include <devices/memory.h> 31 34 32 35 33 36 typedef struct ixp_timer_counter_s {

Configure Feed

Configure Feed