gwj / at91sam9263 · Commits

Commit d68f13063bea4541fbb410fc2d195eb0f2926c79

Authored by j_mayer
1 parent a13d7523

Merge PowerPC 620 input bus definitions with standard PowerPC 6xx. 

Avoid hardcoding PowerPC interrupts definitions to ease updates.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3393 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 19 additions and 26 deletions
target-ppc/cpu.h
  View file @d68f130
... ... @@ -1150,6 +1150,9 @@ enum {
1150 1150 PPC6xx_INPUT_MCP = 3,
1151 1151 PPC6xx_INPUT_SMI = 4,
1152 1152 PPC6xx_INPUT_INT = 5,
  1153 + PPC6xx_INPUT_TBEN = 6,
  1154 + PPC6xx_INPUT_WAKEUP = 7,
  1155 + PPC6xx_INPUT_NB,
1153 1156 };
1154 1157  
1155 1158 enum {
... ... @@ -1161,6 +1164,7 @@ enum {
1161 1164 PPCBookE_INPUT_SMI = 4,
1162 1165 PPCBookE_INPUT_INT = 5,
1163 1166 PPCBookE_INPUT_CINT = 6,
  1167 + PPCBookE_INPUT_NB,
1164 1168 };
1165 1169  
1166 1170 enum {
... ... @@ -1177,18 +1181,6 @@ enum {
1177 1181  
1178 1182 #if defined(TARGET_PPC64)
1179 1183 enum {
1180   - /* PowerPC 620 (and probably others) input pins */
1181   - PPC620_INPUT_HRESET = 0,
1182   - PPC620_INPUT_SRESET = 1,
1183   - PPC620_INPUT_CKSTP = 2,
1184   - PPC620_INPUT_TBEN = 3,
1185   - PPC620_INPUT_WAKEUP = 4,
1186   - PPC620_INPUT_MCP = 5,
1187   - PPC620_INPUT_SMI = 6,
1188   - PPC620_INPUT_INT = 7,
1189   -};
1190   -
1191   -enum {
1192 1184 /* PowerPC 970 input pins */
1193 1185 PPC970_INPUT_HRESET = 0,
1194 1186 PPC970_INPUT_SRESET = 1,
... ... @@ -1204,21 +1196,22 @@ enum {
1204 1196 enum {
1205 1197 /* External hardware exception sources */
1206 1198 PPC_INTERRUPT_RESET = 0, /* Reset exception */
1207   - PPC_INTERRUPT_MCK = 1, /* Machine check exception */
1208   - PPC_INTERRUPT_EXT = 2, /* External interrupt */
1209   - PPC_INTERRUPT_SMI = 3, /* System management interrupt */
1210   - PPC_INTERRUPT_CEXT = 4, /* Critical external interrupt */
1211   - PPC_INTERRUPT_DEBUG = 5, /* External debug exception */
1212   - PPC_INTERRUPT_THERM = 6, /* Thermal exception */
  1199 + PPC_INTERRUPT_WAKEUP, /* Wakeup exception */
  1200 + PPC_INTERRUPT_MCK, /* Machine check exception */
  1201 + PPC_INTERRUPT_EXT, /* External interrupt */
  1202 + PPC_INTERRUPT_SMI, /* System management interrupt */
  1203 + PPC_INTERRUPT_CEXT, /* Critical external interrupt */
  1204 + PPC_INTERRUPT_DEBUG, /* External debug exception */
  1205 + PPC_INTERRUPT_THERM, /* Thermal exception */
1213 1206 /* Internal hardware exception sources */
1214   - PPC_INTERRUPT_DECR = 7, /* Decrementer exception */
1215   - PPC_INTERRUPT_HDECR = 8, /* Hypervisor decrementer exception */
1216   - PPC_INTERRUPT_PIT = 9, /* Programmable inteval timer interrupt */
1217   - PPC_INTERRUPT_FIT = 10, /* Fixed interval timer interrupt */
1218   - PPC_INTERRUPT_WDT = 11, /* Watchdog timer interrupt */
1219   - PPC_INTERRUPT_CDOORBELL = 12, /* Critical doorbell interrupt */
1220   - PPC_INTERRUPT_DOORBELL = 13, /* Doorbell interrupt */
1221   - PPC_INTERRUPT_PERFM = 14, /* Performance monitor interrupt */
  1207 + PPC_INTERRUPT_DECR, /* Decrementer exception */
  1208 + PPC_INTERRUPT_HDECR, /* Hypervisor decrementer exception */
  1209 + PPC_INTERRUPT_PIT, /* Programmable inteval timer interrupt */
  1210 + PPC_INTERRUPT_FIT, /* Fixed interval timer interrupt */
  1211 + PPC_INTERRUPT_WDT, /* Watchdog timer interrupt */
  1212 + PPC_INTERRUPT_CDOORBELL, /* Critical doorbell interrupt */
  1213 + PPC_INTERRUPT_DOORBELL, /* Doorbell interrupt */
  1214 + PPC_INTERRUPT_PERFM, /* Performance monitor interrupt */
1222 1215 };
1223 1216  
1224 1217 /*****************************************************************************/
... ...