1
From 0845de7de24b1b7f21966d6d43a0e2147aad3ab8 Mon Sep 17 00:00:00 2001
2
From: Peter Maydell <peter.maydell@linaro.org>
3
Date: Tue, 4 Dec 2012 14:10:08 +0000
4
Subject: [PATCH 31/77] hw/omap_spi.c: Fix indentation following previous patch
6
Fix indentation (whitespace-only change split out from previous
7
patch to make it easier to review).
9
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
11
hw/omap_spi.c | 70 +++++++++++++++++++++++++++++------------------------------
12
1 file changed, 35 insertions(+), 35 deletions(-)
14
diff --git a/hw/omap_spi.c b/hw/omap_spi.c
15
index 5a11dbc..060e82c 100644
18
@@ -180,50 +180,50 @@ static void omap_mcspi_transfer_run(OMAPSPIBusState *s, int chnum)
20
if (!(s->control & 1) || /* SINGLE */
21
(ch->config & (1 << 20))) { /* FORCE */
22
- wl = 1 + (0x1f & (ch->config >> 7)); /* WL */
23
- if (!IS_OMAP3_SPI(s) || s->fifo_ch != chnum ||
24
- !((ch->config >> 27) & 3)) { /* FFER | FFEW */
25
+ wl = 1 + (0x1f & (ch->config >> 7)); /* WL */
26
+ if (!IS_OMAP3_SPI(s) || s->fifo_ch != chnum ||
27
+ !((ch->config >> 27) & 3)) { /* FFER | FFEW */
28
+ ch->rx = spi_txrx(s->bus, chnum, ch->tx, wl);
30
+ switch ((ch->config >> 27) & 3) {
31
+ case 1: /* !FFER, FFEW */
33
+ ch->tx = omap_mcspi_fifo_get(&s->tx_fifo, wl);
34
ch->rx = spi_txrx(s->bus, chnum, ch->tx, wl);
36
- switch ((ch->config >> 27) & 3) {
37
- case 1: /* !FFER, FFEW */
40
+ case 2: /* FFER, !FFEW */
41
+ ch->rx = spi_txrx(s->bus, chnum, ch->tx, wl);
43
+ omap_mcspi_fifo_put(&s->rx_fifo, wl, ch->rx);
46
+ case 3: /* FFER, FFEW */
47
+ while (s->rx_fifo.len < s->rx_fifo.size &&
48
+ s->tx_fifo.len && s->fifo_wcnt) {
50
ch->tx = omap_mcspi_fifo_get(&s->tx_fifo, wl);
51
ch->rx = spi_txrx(s->bus, chnum, ch->tx, wl);
54
- case 2: /* FFER, !FFEW */
55
- ch->rx = spi_txrx(s->bus, chnum, ch->tx, wl);
57
omap_mcspi_fifo_put(&s->rx_fifo, wl, ch->rx);
60
- case 3: /* FFER, FFEW */
61
- while (s->rx_fifo.len < s->rx_fifo.size &&
62
- s->tx_fifo.len && s->fifo_wcnt) {
64
- ch->tx = omap_mcspi_fifo_get(&s->tx_fifo, wl);
65
- ch->rx = spi_txrx(s->bus, chnum, ch->tx, wl);
67
- omap_mcspi_fifo_put(&s->rx_fifo, wl, ch->rx);
74
- if ((ch->config & (1 << 28)) && /* FFER */
75
- s->rx_fifo.len >= s->rx_fifo.size)
76
- ch->status |= 1 << 6; /* RXFFF */
77
- ch->status &= ~(1 << 5); /* RXFFE */
78
- ch->status &= ~(1 << 4); /* TXFFF */
79
- if ((ch->config & (1 << 27)) && /* FFEW */
81
- ch->status |= 1 << 3; /* TXFFE */
82
- if (!s->fifo_wcnt &&
83
- ((s->xferlevel >> 16) & 0xffff)) /* WCNT */
84
- s->irqst |= 1 << 17; /* EOW */
89
+ if ((ch->config & (1 << 28)) && /* FFER */
90
+ s->rx_fifo.len >= s->rx_fifo.size)
91
+ ch->status |= 1 << 6; /* RXFFF */
92
+ ch->status &= ~(1 << 5); /* RXFFE */
93
+ ch->status &= ~(1 << 4); /* TXFFF */
94
+ if ((ch->config & (1 << 27)) && /* FFEW */
96
+ ch->status |= 1 << 3; /* TXFFE */
97
+ if (!s->fifo_wcnt &&
98
+ ((s->xferlevel >> 16) & 0xffff)) /* WCNT */
99
+ s->irqst |= 1 << 17; /* EOW */