OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block/nand: Formatting sweep

Browse Source 
Make this code closer to passing checkpatch. Mostly missing braces, but
a few rogue tabs in there as well.

Cc: qemu-trivial@nongnu.org

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Peter Crosthwaite 2013-06-18 21:08:57 +10:00 committed by Michael Tokarev
parent 329f97fc4f
commit 1984745ea8
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/block/nand.c
View File

@ -298,10 +298,8 @@ static void nand_command(NANDFlashState *s)
case NAND_CMD_BLOCKERASE2: case NAND_CMD_BLOCKERASE2:
s->addr &= (1ull << s->addrlen * 8) - 1; s->addr &= (1ull << s->addrlen * 8) - 1;
if (nand_flash_ids[s->chip_id].options & NAND_SAMSUNG_LP) s->addr <<= nand_flash_ids[s->chip_id].options & NAND_SAMSUNG_LP ?
s->addr <<= 16; 16 : 8;
else
s->addr <<= 8;
if (s->wp) { if (s->wp) {
s->blk_erase(s); s->blk_erase(s);
@ -464,10 +462,11 @@ void nand_setpins(DeviceState *dev, uint8_t cle, uint8_t ale,
s->ce = ce; s->ce = ce;
s->wp = wp; s->wp = wp;
s->gnd = gnd; s->gnd = gnd;
if (wp) if (wp) {
s->status |= NAND_IOSTATUS_UNPROTCT; s->status |= NAND_IOSTATUS_UNPROTCT;
else } else {
s->status &= ~NAND_IOSTATUS_UNPROTCT; s->status &= ~NAND_IOSTATUS_UNPROTCT;
}
} }
void nand_getpins(DeviceState *dev, int *rb) void nand_getpins(DeviceState *dev, int *rb)
@ -489,13 +488,12 @@ void nand_setio(DeviceState *dev, uint32_t value)
return; return;
} }
} }
if (value == NAND_CMD_READ0) if (value == NAND_CMD_READ0) {
s->offset = 0; s->offset = 0;
else if (value == NAND_CMD_READ1) { } else if (value == NAND_CMD_READ1) {
s->offset = 0x100; s->offset = 0x100;
value = NAND_CMD_READ0; value = NAND_CMD_READ0;
} } else if (value == NAND_CMD_READ2) {
else if (value == NAND_CMD_READ2) {
s->offset = 1 << s->page_shift; s->offset = 1 << s->page_shift;
value = NAND_CMD_READ0; value = NAND_CMD_READ0;
} }
@ -508,8 +506,9 @@ void nand_setio(DeviceState *dev, uint32_t value)
s->cmd == NAND_CMD_BLOCKERASE2 || s->cmd == NAND_CMD_BLOCKERASE2 ||
s->cmd == NAND_CMD_NOSERIALREAD2 || s->cmd == NAND_CMD_NOSERIALREAD2 ||
s->cmd == NAND_CMD_RANDOMREAD2 || s->cmd == NAND_CMD_RANDOMREAD2 ||
s->cmd == NAND_CMD_RESET) s->cmd == NAND_CMD_RESET) {
nand_command(s); nand_command(s);
}
if (s->cmd != NAND_CMD_RANDOMREAD2) { if (s->cmd != NAND_CMD_RANDOMREAD2) {
s->addrlen = 0; s->addrlen = 0;
@ -596,8 +595,9 @@ uint32_t nand_getio(DeviceState *dev)
s->iolen = (1 << s->page_shift) + (1 << s->oob_shift) - offset; s->iolen = (1 << s->page_shift) + (1 << s->oob_shift) - offset;
} }
if (s->ce || s->iolen <= 0) if (s->ce || s->iolen <= 0) {
return 0; return 0;
}
for (offset = s->buswidth; offset--;) { for (offset = s->buswidth; offset--;) {
x |= s->ioaddr[offset] << (offset << 3); x |= s->ioaddr[offset] << (offset << 3);
@ -696,8 +696,9 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s)
uint8_t iobuf[0x200] = { [0 ... 0x1ff] = 0xff, }; uint8_t iobuf[0x200] = { [0 ... 0x1ff] = 0xff, };
addr = s->addr & ~((1 << (ADDR_SHIFT + s->erase_shift)) - 1); addr = s->addr & ~((1 << (ADDR_SHIFT + s->erase_shift)) - 1);
if (PAGE(addr) >= s->pages) if (PAGE(addr) >= s->pages) {
return; return;
}
if (!s->bdrv) { if (!s->bdrv) {
memset(s->storage + PAGE_START(addr), memset(s->storage + PAGE_START(addr),
@ -725,11 +726,12 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s)
memset(iobuf, 0xff, 0x200); memset(iobuf, 0xff, 0x200);
i = (addr & ~0x1ff) + 0x200; i = (addr & ~0x1ff) + 0x200;
for (addr += ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200; for (addr += ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200;
i < addr; i += 0x200) i < addr; i += 0x200) {
if (bdrv_write(s->bdrv, i >> 9, iobuf, 1) < 0) { if (bdrv_write(s->bdrv, i >> 9, iobuf, 1) < 0) {
printf("%s: write error in sector %" PRIu64 "\n", printf("%s: write error in sector %" PRIu64 "\n",
__func__, i >> 9); __func__, i >> 9);
} }
}
page = i >> 9; page = i >> 9;
if (bdrv_read(s->bdrv, page, iobuf, 1) < 0) { if (bdrv_read(s->bdrv, page, iobuf, 1) < 0) {
@ -745,8 +747,9 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s)
static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s, static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s,
uint64_t addr, int offset) uint64_t addr, int offset)
{ {
if (PAGE(addr) >= s->pages) if (PAGE(addr) >= s->pages) {
return; return;
}
if (s->bdrv) { if (s->bdrv) {
if (s->mem_oob) { if (s->mem_oob) {