diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-10-02 18:24:21 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-10-02 18:24:21 +0000 |
| commit | 88b4e9dbe242ff2b83f9539a13efc1d4f935da7d (patch) | |
| tree | 8edddbb2f76bfd37659578af547c8b6f5094aa64 /hw | |
| parent | daa41b0010afb51a591f1a514044fbc67003afe4 (diff) | |
Make some tables const
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5395 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/e1000.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index 8209f54086..265bd0dc35 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -131,7 +131,7 @@ enum { }; enum { PHY_R = 1, PHY_W = 2, PHY_RW = PHY_R | PHY_W }; -static char phy_regcap[0x20] = { +static const char phy_regcap[0x20] = { [PHY_STATUS] = PHY_R, [M88E1000_EXT_PHY_SPEC_CTRL] = PHY_RW, [PHY_ID1] = PHY_R, [M88E1000_PHY_SPEC_CTRL] = PHY_RW, [PHY_CTRL] = PHY_RW, [PHY_1000T_CTRL] = PHY_RW, @@ -783,7 +783,7 @@ e1000_mmio_readw(void *opaque, target_phys_addr_t addr) (8 * (addr & 3))) & 0xffff; } -static int mac_regtosave[] = { +static const int mac_regtosave[] = { CTRL, EECD, EERD, GPRC, GPTC, ICR, ICS, IMC, IMS, LEDCTL, MANC, MDIC, MPC, PBA, RCTL, RDBAH, RDBAL, RDH, RDLEN, RDT, STATUS, SWSM, TCTL, TDBAH, TDBAL, TDH, TDLEN, @@ -791,7 +791,7 @@ static int mac_regtosave[] = { }; enum { MAC_NSAVE = sizeof mac_regtosave/sizeof *mac_regtosave }; -static struct { +static const struct { int size; int array0; } mac_regarraystosave[] = { {32, RA}, {128, MTA} }; @@ -887,7 +887,7 @@ nic_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static uint16_t e1000_eeprom_template[64] = { +static const uint16_t e1000_eeprom_template[64] = { 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x3000, 0x1000, 0x6403, E1000_DEVID, 0x8086, E1000_DEVID, 0x8086, 0x3040, 0x0008, 0x2000, 0x7e14, 0x0048, 0x1000, 0x00d8, 0x0000, 0x2700, @@ -898,7 +898,7 @@ static uint16_t e1000_eeprom_template[64] = { 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, }; -static uint16_t phy_reg_init[] = { +static const uint16_t phy_reg_init[] = { [PHY_CTRL] = 0x1140, [PHY_STATUS] = 0x796d, // link initially up [PHY_ID1] = 0x141, [PHY_ID2] = PHY_ID2_INIT, [PHY_1000T_CTRL] = 0x0e00, [M88E1000_PHY_SPEC_CTRL] = 0x360, @@ -907,7 +907,7 @@ static uint16_t phy_reg_init[] = { [M88E1000_PHY_SPEC_STATUS] = 0xac00, }; -static uint32_t mac_reg_init[] = { +static const uint32_t mac_reg_init[] = { [PBA] = 0x00100030, [LEDCTL] = 0x602, [CTRL] = E1000_CTRL_SWDPIN2 | E1000_CTRL_SWDPIN0 | |