escc: don't use reserved _t suffix

[qemu.git] / hw / escc.c

diff --git a/hw/escc.c b/hw/escc.c
index 0b20aeabb8ab727a3f4b963c772b0ed1f2dfa2e1..6d2fd36b11629499f525972bb6a7c2477e21d6bb 100644 (file)
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -88,13 +88,13 @@
 
 typedef enum {
     chn_a, chn_b,
-} chn_id_t;
+} ChnID;
 
 #define CHN_C(s) ((s)->chn == chn_b? 'b' : 'a')
 
 typedef enum {
     ser, kbd, mouse,
-} chn_type_t;
+} ChnType;
 
 #define SERIO_QUEUE_SIZE 256
 
@@ -108,8 +108,8 @@ typedef struct ChannelState {
     qemu_irq irq;
     uint32_t reg;
     uint32_t rxint, txint, rxint_under_svc, txint_under_svc;
-    chn_id_t chn; // this channel, A (base+4) or B (base+0)
-    chn_type_t type;
+    ChnID chn; // this channel, A (base+4) or B (base+0)
+    ChnType type;
     struct ChannelState *otherchn;
     uint8_t rx, tx, wregs[SERIAL_REGS], rregs[SERIAL_REGS];
     SERIOQueue queue;