Patchwork Sun4m / Sun4u : Uppercase RAM_size

login
register
mail settings
Submitter Olivier DANET
Date Jan. 27, 2011, 7:07 p.m.
Message ID <20110127190744.245670@gmx.com>
Download mbox | patch
Permalink /patch/80719/
State New
Headers show

Comments

Olivier DANET - Jan. 27, 2011, 7:07 p.m.
Signed-off-by: Olivier Danet <odanet@caramail.com>
---
 hw/sun4m.c     6 +++---
 hw/sun4u.c     4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

--
1.6.2.4
Blue Swirl - Jan. 28, 2011, 9:29 p.m.
On Thu, Jan 27, 2011 at 7:07 PM, Olivier DANET <odanet@caramail.com> wrote:

Please instead describe the patch with something like using the upper
case version is more correct because it is the argument of the
function.

The patch is OK, except that the non-breaking space (0xa0 or UTF-8
0xc2 0xa0) characters confuse git am. Perhaps there is a problem with
your email setup?

> Signed-off-by: Olivier Danet <odanet@caramail.com>
> ---
>  hw/sun4m.c     6 +++---
>  hw/sun4u.c     4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/sun4m.c b/hw/sun4m.c
> index 30e8a21..8076f25 100644
> --- a/hw/sun4m.c
> +++ b/hw/sun4m.c
> @@ -962,7 +962,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,
>
>      fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);
>      fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
> -    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
> +    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);
>      fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
>      fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);
>      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
> @@ -1573,7 +1573,7 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size,
>
>      fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);
>      fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
> -    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
> +    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);
>      fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
>      fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);
>      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
> @@ -1765,7 +1765,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size,
>
>      fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);
>      fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
> -    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
> +    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);
>      fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
>      fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);
>      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
> diff --git a/hw/sun4u.c b/hw/sun4u.c
> index 90b1ce2..23df953 100644
> --- a/hw/sun4u.c
> +++ b/hw/sun4u.c
> @@ -813,7 +813,7 @@ static void sun4uv_init(ram_addr_t RAM_size,
>
>      initrd_size = 0;
>      kernel_size = sun4u_load_kernel(kernel_filename, initrd_filename,
> -                                    ram_size, &initrd_size);
> +                                    RAM_size, &initrd_size);
>
>      sun4u_NVRAM_set_params(nvram, NVRAM_SIZE, "Sun4u", RAM_size, boot_devices,
>                             KERNEL_LOAD_ADDR, kernel_size,
> @@ -826,7 +826,7 @@ static void sun4uv_init(ram_addr_t RAM_size,
>
>      fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0);
>      fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
> -    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
> +    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);
>      fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
>      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
>      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
> --
> 1.6.2.4
>
>

Patch

diff --git a/hw/sun4m.c b/hw/sun4m.c
index 30e8a21..8076f25 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -962,7 +962,7 @@  static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,
 
     fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);
     fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
-    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
+    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);
     fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
     fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
@@ -1573,7 +1573,7 @@  static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size,
 
     fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);
     fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
-    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
+    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);
     fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
     fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
@@ -1765,7 +1765,7 @@  static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size,
 
     fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);
     fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
-    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
+    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);
     fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
     fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 90b1ce2..23df953 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -813,7 +813,7 @@  static void sun4uv_init(ram_addr_t RAM_size,
 
     initrd_size = 0;
     kernel_size = sun4u_load_kernel(kernel_filename, initrd_filename,
-                                    ram_size, &initrd_size);
+                                    RAM_size, &initrd_size);
 
     sun4u_NVRAM_set_params(nvram, NVRAM_SIZE, "Sun4u", RAM_size, boot_devices,
                            KERNEL_LOAD_ADDR, kernel_size,
@@ -826,7 +826,7 @@  static void sun4uv_init(ram_addr_t RAM_size,
 
     fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0);
     fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
-    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
+    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);
     fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);