Re: [Qemu-devel] [PATCH 2/2] dma/rc4030: Minor code style cleanup

2019-07-01 Thread Hervé Poussineau 

Le 25/06/2019 à 16:27, Aleksandar Markovic a écrit :

From: Aleksandar Markovic 

Fix some simple checkpatch.pl warnings in rc4030.c.

Signed-off-by: Aleksandar Markovic 


Reviewed-by: Hervé Poussineau 


---
  hw/dma/rc4030.c | 18 +++---
  1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index 88ff271..155af9b 100644
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -58,8 +58,8 @@ typedef struct dma_pagetable_entry {
  
  #define TYPE_RC4030_IOMMU_MEMORY_REGION "rc4030-iommu-memory-region"
  
-typedef struct rc4030State

-{
+typedef struct rc4030State {
+
  SysBusDevice parent;
  
  uint32_t config; /* 0x: RC4030 config register */

@@ -152,8 +152,9 @@ static uint64_t rc4030_read(void *opaque, hwaddr addr, 
unsigned int size)
  case 0x0058:
  val = s->cache_bmask;
  /* HACK */
-if (s->cache_bmask == (uint32_t)-1)
+if (s->cache_bmask == (uint32_t)-1) {
  s->cache_bmask = 0;
+}
  break;
  /* Remote Speed Registers */
  case 0x0070:
@@ -538,8 +539,9 @@ static void rc4030_reset(DeviceState *dev)
  
  s->memory_refresh_rate = 0x18186;

  s->nvram_protect = 7;
-for (i = 0; i < 15; i++)
+for (i = 0; i < 15; i++) {
  s->rem_speed[i] = 7;
+}
  s->imr_jazz = 0x10; /* XXX: required by firmware, but why? */
  s->isr_jazz = 0;
  
@@ -551,7 +553,7 @@ static void rc4030_reset(DeviceState *dev)
  
  static int rc4030_post_load(void *opaque, int version_id)

  {
-rc4030State* s = opaque;
+rc4030State *s = opaque;
  
  set_next_tick(s);

  update_jazz_irq(s);
@@ -591,7 +593,8 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t 
*buf, int len, int is_wri
  hwaddr dma_addr;
  int dev_to_mem;
  
-s->dma_regs[n][DMA_REG_ENABLE] &= ~(DMA_FLAG_TC_INTR | DMA_FLAG_MEM_INTR | DMA_FLAG_ADDR_INTR);

+s->dma_regs[n][DMA_REG_ENABLE] &=
+   ~(DMA_FLAG_TC_INTR | DMA_FLAG_MEM_INTR | DMA_FLAG_ADDR_INTR);
  
  /* Check DMA channel consistency */

  dev_to_mem = (s->dma_regs[n][DMA_REG_ENABLE] & DMA_FLAG_MEM_TO_DEV) ? 0 : 
1;
@@ -603,8 +606,9 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t 
*buf, int len, int is_wri
  }
  
  /* Get start address and len */

-if (len > s->dma_regs[n][DMA_REG_COUNT])
+if (len > s->dma_regs[n][DMA_REG_COUNT]) {
  len = s->dma_regs[n][DMA_REG_COUNT];
+}
  dma_addr = s->dma_regs[n][DMA_REG_ADDRESS];
  
  /* Read/write data at right place */

Re: [Qemu-devel] [PATCH 2/2] dma/rc4030: Minor code style cleanup

2019-06-25 Thread Aleksandar Rikalo 
> From: Aleksandar Markovic 
> Sent: Tuesday, June 25, 2019 4:27 PM
> To: qemu-devel@nongnu.org
> Cc: Aleksandar Markovic; Aleksandar Rikalo; hpous...@reactos.org; 
> f4...@amsat.org
> Subject: [PATCH 2/2] dma/rc4030: Minor code style cleanup
>
> From: Aleksandar Markovic 
>
> Fix some simple checkpatch.pl warnings in rc4030.c.
>
> Signed-off-by: Aleksandar Markovic 
> ---
>  hw/dma/rc4030.c | 18 +++---
>  1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
> index 88ff271..155af9b 100644
> --- a/hw/dma/rc4030.c
> +++ b/hw/dma/rc4030.c
> @@ -58,8 +58,8 @@ typedef struct dma_pagetable_entry {
>
>  #define TYPE_RC4030_IOMMU_MEMORY_REGION "rc4030-iommu-memory-region"
>
> -typedef struct rc4030State
> -{
> +typedef struct rc4030State {
> +
>  SysBusDevice parent;
>
>  uint32_t config; /* 0x: RC4030 config register */
> @@ -152,8 +152,9 @@ static uint64_t rc4030_read(void *opaque, hwaddr addr, 
> unsigned int size)
>  case 0x0058:
>  val = s->cache_bmask;
>  /* HACK */
> -if (s->cache_bmask == (uint32_t)-1)
> +if (s->cache_bmask == (uint32_t)-1) {
>  s->cache_bmask = 0;
> +}
>  break;
>  /* Remote Speed Registers */
>  case 0x0070:
> @@ -538,8 +539,9 @@ static void rc4030_reset(DeviceState *dev)
>
>  s->memory_refresh_rate = 0x18186;
>  s->nvram_protect = 7;
> -for (i = 0; i < 15; i++)
> +for (i = 0; i < 15; i++) {
>  s->rem_speed[i] = 7;
> +}
>  s->imr_jazz = 0x10; /* XXX: required by firmware, but why? */
>  s->isr_jazz = 0;
>
> @@ -551,7 +553,7 @@ static void rc4030_reset(DeviceState *dev)
>
>  static int rc4030_post_load(void *opaque, int version_id)
>  {
> -rc4030State* s = opaque;
> +rc4030State *s = opaque;
>
>  set_next_tick(s);
>  update_jazz_irq(s);
> @@ -591,7 +593,8 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t 
> *buf, int len, int is_wri
>  hwaddr dma_addr;
>  int dev_to_mem;
>
> -s->dma_regs[n][DMA_REG_ENABLE] &= ~(DMA_FLAG_TC_INTR | DMA_FLAG_MEM_INTR 
> | DMA_FLAG_ADDR_INTR);
> +s->dma_regs[n][DMA_REG_ENABLE] &=
> +   ~(DMA_FLAG_TC_INTR | DMA_FLAG_MEM_INTR | DMA_FLAG_ADDR_INTR);
>
>  /* Check DMA channel consistency */
>  dev_to_mem = (s->dma_regs[n][DMA_REG_ENABLE] & DMA_FLAG_MEM_TO_DEV) ? 0 
> : 1;
> @@ -603,8 +606,9 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t 
> *buf, int len, int is_wri
>  }
>
>  /* Get start address and len */
> -if (len > s->dma_regs[n][DMA_REG_COUNT])
> +if (len > s->dma_regs[n][DMA_REG_COUNT]) {
>  len = s->dma_regs[n][DMA_REG_COUNT];
> +}
>  dma_addr = s->dma_regs[n][DMA_REG_ADDRESS];
>
>  /* Read/write data at right place */
> --
> 2.7.4

Reviewed-by: Aleksandar Rikalo

Re: [Qemu-devel] [PATCH 2/2] dma/rc4030: Minor code style cleanup

2019-06-25 Thread Philippe Mathieu-Daudé 
On 6/25/19 4:27 PM, Aleksandar Markovic wrote:
> From: Aleksandar Markovic 
> 
> Fix some simple checkpatch.pl warnings in rc4030.c.
> 
> Signed-off-by: Aleksandar Markovic 

Reviewed-by: Philippe Mathieu-Daudé 

> ---
>  hw/dma/rc4030.c | 18 +++---
>  1 file changed, 11 insertions(+), 7 deletions(-)
> 
> diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
> index 88ff271..155af9b 100644
> --- a/hw/dma/rc4030.c
> +++ b/hw/dma/rc4030.c
> @@ -58,8 +58,8 @@ typedef struct dma_pagetable_entry {
>  
>  #define TYPE_RC4030_IOMMU_MEMORY_REGION "rc4030-iommu-memory-region"
>  
> -typedef struct rc4030State
> -{
> +typedef struct rc4030State {
> +
>  SysBusDevice parent;
>  
>  uint32_t config; /* 0x: RC4030 config register */
> @@ -152,8 +152,9 @@ static uint64_t rc4030_read(void *opaque, hwaddr addr, 
> unsigned int size)
>  case 0x0058:
>  val = s->cache_bmask;
>  /* HACK */
> -if (s->cache_bmask == (uint32_t)-1)
> +if (s->cache_bmask == (uint32_t)-1) {
>  s->cache_bmask = 0;
> +}
>  break;
>  /* Remote Speed Registers */
>  case 0x0070:
> @@ -538,8 +539,9 @@ static void rc4030_reset(DeviceState *dev)
>  
>  s->memory_refresh_rate = 0x18186;
>  s->nvram_protect = 7;
> -for (i = 0; i < 15; i++)
> +for (i = 0; i < 15; i++) {
>  s->rem_speed[i] = 7;
> +}
>  s->imr_jazz = 0x10; /* XXX: required by firmware, but why? */
>  s->isr_jazz = 0;
>  
> @@ -551,7 +553,7 @@ static void rc4030_reset(DeviceState *dev)
>  
>  static int rc4030_post_load(void *opaque, int version_id)
>  {
> -rc4030State* s = opaque;
> +rc4030State *s = opaque;
>  
>  set_next_tick(s);
>  update_jazz_irq(s);
> @@ -591,7 +593,8 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t 
> *buf, int len, int is_wri
>  hwaddr dma_addr;
>  int dev_to_mem;
>  
> -s->dma_regs[n][DMA_REG_ENABLE] &= ~(DMA_FLAG_TC_INTR | DMA_FLAG_MEM_INTR 
> | DMA_FLAG_ADDR_INTR);
> +s->dma_regs[n][DMA_REG_ENABLE] &=
> +   ~(DMA_FLAG_TC_INTR | DMA_FLAG_MEM_INTR | DMA_FLAG_ADDR_INTR);
>  
>  /* Check DMA channel consistency */
>  dev_to_mem = (s->dma_regs[n][DMA_REG_ENABLE] & DMA_FLAG_MEM_TO_DEV) ? 0 
> : 1;
> @@ -603,8 +606,9 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t 
> *buf, int len, int is_wri
>  }
>  
>  /* Get start address and len */
> -if (len > s->dma_regs[n][DMA_REG_COUNT])
> +if (len > s->dma_regs[n][DMA_REG_COUNT]) {
>  len = s->dma_regs[n][DMA_REG_COUNT];
> +}
>  dma_addr = s->dma_regs[n][DMA_REG_ADDRESS];
>  
>  /* Read/write data at right place */
>

[Qemu-devel] [PATCH 2/2] dma/rc4030: Minor code style cleanup

2019-06-25 Thread Aleksandar Markovic 
From: Aleksandar Markovic 

Fix some simple checkpatch.pl warnings in rc4030.c.

Signed-off-by: Aleksandar Markovic 
---
 hw/dma/rc4030.c | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index 88ff271..155af9b 100644
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -58,8 +58,8 @@ typedef struct dma_pagetable_entry {
 
 #define TYPE_RC4030_IOMMU_MEMORY_REGION "rc4030-iommu-memory-region"
 
-typedef struct rc4030State
-{
+typedef struct rc4030State {
+
 SysBusDevice parent;
 
 uint32_t config; /* 0x: RC4030 config register */
@@ -152,8 +152,9 @@ static uint64_t rc4030_read(void *opaque, hwaddr addr, 
unsigned int size)
 case 0x0058:
 val = s->cache_bmask;
 /* HACK */
-if (s->cache_bmask == (uint32_t)-1)
+if (s->cache_bmask == (uint32_t)-1) {
 s->cache_bmask = 0;
+}
 break;
 /* Remote Speed Registers */
 case 0x0070:
@@ -538,8 +539,9 @@ static void rc4030_reset(DeviceState *dev)
 
 s->memory_refresh_rate = 0x18186;
 s->nvram_protect = 7;
-for (i = 0; i < 15; i++)
+for (i = 0; i < 15; i++) {
 s->rem_speed[i] = 7;
+}
 s->imr_jazz = 0x10; /* XXX: required by firmware, but why? */
 s->isr_jazz = 0;
 
@@ -551,7 +553,7 @@ static void rc4030_reset(DeviceState *dev)
 
 static int rc4030_post_load(void *opaque, int version_id)
 {
-rc4030State* s = opaque;
+rc4030State *s = opaque;
 
 set_next_tick(s);
 update_jazz_irq(s);
@@ -591,7 +593,8 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t 
*buf, int len, int is_wri
 hwaddr dma_addr;
 int dev_to_mem;
 
-s->dma_regs[n][DMA_REG_ENABLE] &= ~(DMA_FLAG_TC_INTR | DMA_FLAG_MEM_INTR | 
DMA_FLAG_ADDR_INTR);
+s->dma_regs[n][DMA_REG_ENABLE] &=
+   ~(DMA_FLAG_TC_INTR | DMA_FLAG_MEM_INTR | DMA_FLAG_ADDR_INTR);
 
 /* Check DMA channel consistency */
 dev_to_mem = (s->dma_regs[n][DMA_REG_ENABLE] & DMA_FLAG_MEM_TO_DEV) ? 0 : 
1;
@@ -603,8 +606,9 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t 
*buf, int len, int is_wri
 }
 
 /* Get start address and len */
-if (len > s->dma_regs[n][DMA_REG_COUNT])
+if (len > s->dma_regs[n][DMA_REG_COUNT]) {
 len = s->dma_regs[n][DMA_REG_COUNT];
+}
 dma_addr = s->dma_regs[n][DMA_REG_ADDRESS];
 
 /* Read/write data at right place */
-- 
2.7.4