summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-10-17 02:35:26 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-10-17 02:35:26 +0000
commit49db8342d56dd918243dbcbcec1f7ab24fc33ebe (patch)
tree8244c4e724fa65d22535b41eccbb3d7bb4e40cca /sys
parent50b7fa8fe5aa9486f8fada4e0dcbffb37eea55f2 (diff)
decl variables earlier; pointed out by fgsch
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/i2c/spdmem.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/i2c/spdmem.c b/sys/dev/i2c/spdmem.c
index 837b9947249..bd85651a4fa 100644
--- a/sys/dev/i2c/spdmem.c
+++ b/sys/dev/i2c/spdmem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spdmem.c,v 1.14 2007/10/17 02:09:18 deraadt Exp $ */
+/* $OpenBSD: spdmem.c,v 1.15 2007/10/17 02:35:25 deraadt Exp $ */
/* $NetBSD: spdmem.c,v 1.3 2007/09/20 23:09:59 xtraeme Exp $ */
/*
@@ -280,14 +280,18 @@ spdmem_attach(struct device *parent, struct device *self, void *aux)
dimm_size = (1 << (rows + cols - 13));
} else if (s->sm_type == SPDMEM_MEMTYPE_SDRAM ||
s->sm_type == SPDMEM_MEMTYPE_DDRSDRAM) {
+ int num_banks, per_chip;
+
+ num_banks = s->sm_data[SPDMEM_SDR_BANKS];
+ per_chip = s->sm_data[SPDMEM_SDR_BANKS_PER_CHIP];
rows = s->sm_data[SPDMEM_SDR_ROWS] & 0x0f;
cols = s->sm_data[SPDMEM_SDR_COLS] & 0x0f;
- int num_banks = s->sm_data[SPDMEM_SDR_BANKS];
- int per_chip = s->sm_data[SPDMEM_SDR_BANKS_PER_CHIP];
dimm_size = (1 << (rows + cols - 17)) * num_banks * per_chip;
} else if (s->sm_type == SPDMEM_MEMTYPE_DDR2SDRAM) {
- int num_ranks = (s->sm_data[SPDMEM_DDR2_RANKS] & 0x7) + 1;
- int density = (s->sm_data[SPDMEM_DDR2_RANK_DENSITY] & 0xf0) |
+ int num_ranks, density;
+
+ num_ranks = (s->sm_data[SPDMEM_DDR2_RANKS] & 0x7) + 1;
+ density = (s->sm_data[SPDMEM_DDR2_RANK_DENSITY] & 0xf0) |
((s->sm_data[SPDMEM_DDR2_RANK_DENSITY] & 0x0f) << 8);
dimm_size = num_ranks * density * 4;
}