diff options
author | Yannis Damigos <giannis.damigos@gmail.com> | 2016-10-02 17:31:41 +0300 |
---|---|---|
committer | Anas Nashif <nashif@linux.intel.com> | 2016-10-03 20:33:28 +0000 |
commit | 84ae7d83d6c5fa87f7d0940876e244b0f91360e7 (patch) | |
tree | 9c18cd608ebfee9c1469c1fc52f9889aedc39acb /scripts/sysgen | |
parent | 6704ff462e490fb4aca65efd488f7ce5629e1ac1 (diff) |
scripts/sysgen: Fix indentation inconsistency
Building samples or running sanitycheck script fails with
the following error using python 3:
Using /home/xekarfwtos/projects/zephyr as source for kernel
GEN ./Makefile
CHK include/generated/version.h
HOSTCC scripts/basic/fixdep
HOSTCC scripts/gen_idt/version.o
HOSTCC scripts/gen_idt/gen_idt.o
HOSTLD scripts/gen_idt/gen_idt
HOSTCC scripts/gen_offset_header/gen_offset_header.o
HOSTLD scripts/gen_offset_header/gen_offset_header
CHK misc/generated/configs.c
CHK include/generated/offsets.h
CHK misc/generated/sysgen/prj.mdef
UPD misc/generated/sysgen/prj.mdef
File "/home/xekarfwtos/projects/zephyr/scripts/sysgen", line 687
kernel_main_c_out("K_MSGQ_DEFINE(_k_fifo_obj_%s, %s, %s);\n" %
^
TabError: inconsistent use of tabs and spaces in indentation
This patch fixes the indentation inconsistency allowing building
using python 3.
Change-Id: I51bda9452e7ff97fe9f07544927d76ce981700d1
Signed-off-by: Yannis Damigos <giannis.damigos@gmail.com>
Diffstat (limited to 'scripts/sysgen')
-rwxr-xr-x | scripts/sysgen | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/scripts/sysgen b/scripts/sysgen index b9c6458f2..9d958a4a1 100755 --- a/scripts/sysgen +++ b/scripts/sysgen @@ -684,8 +684,8 @@ def kernel_main_c_fifos(): name = fifo[0] depth = fifo[1] width = fifo[2] - kernel_main_c_out("K_MSGQ_DEFINE(_k_fifo_obj_%s, %s, %s);\n" % - (name, depth, width)) + kernel_main_c_out("K_MSGQ_DEFINE(_k_fifo_obj_%s, %s, %s);\n" % + (name, depth, width)) def kernel_main_c_pipes(): @@ -722,8 +722,8 @@ def kernel_main_c_pipes(): # pipe objects for pipe in pipe_list: - name = pipe[0] - size = pipe[1] + name = pipe[0] + size = pipe[1] kernel_main_c_out("K_PIPE_DEFINE(_k_pipe_obj_%s, %d);\n" % (name, size)) @@ -750,7 +750,7 @@ def kernel_main_c_mailboxes(): # mailbox objects for mbx in mbx_list: - name = mbx[0] + name = mbx[0] kernel_main_c_out("K_MBOX_DEFINE(_k_mbox_obj_%s);\n" % (name)) @@ -767,27 +767,27 @@ def kernel_main_c_maps(): if kernel_type == 'micro': # memory map buffers and descriptors - for map in map_list: - name = map[0] - blocks = map[1] - block_size = map[2] - kernel_main_c_out("char __noinit __MAP_%s_buffer[%d];\n" % + for map in map_list: + name = map[0] + blocks = map[1] + block_size = map[2] + kernel_main_c_out("char __noinit __MAP_%s_buffer[%d];\n" % (map[0], blocks * block_size)) - kernel_main_c_out( + kernel_main_c_out( "struct _k_mem_map_struct _k_mem_map_obj_%s = " % (name) + "__K_MEM_MAP_INITIALIZER(%d, %d, __MAP_%s_buffer);\n" % (blocks, block_size, map[0])) - kernel_main_c_out( + kernel_main_c_out( "kmemory_map_t _k_mem_map_ptr_%s " % (name) + " __in_section(_k_mem_map_ptr, public, mem_map) =\n" + " (kmemory_map_t)&_k_mem_map_obj_%s;\n" % (name)) else: # memory map objects - for map in map_list: - name = map[0] - blocks = map[1] - block_size = map[2] + for map in map_list: + name = map[0] + blocks = map[1] + block_size = map[2] kernel_main_c_out("K_MEM_MAP_DEFINE(_k_mem_map_obj_%s, %s, %s);\n" % (name, blocks, block_size)) @@ -1104,31 +1104,31 @@ def generate_sysgen_h_obj_ids(): mutex_type = 'kmutex_t' sem_struct = '_k_sem_struct' sem_type = 'ksem_t' - pipe_struct = '_k_pipe_struct' - pipe_type = 'kpipe_t' - map_struct = '_k_mem_map_struct' - map_type = 'kmemory_map_t' - fifo_struct = '_k_fifo_struct' - fifo_type = 'kfifo_t' - mbox_struct = '_k_mbox_struct' - mbox_type = 'kmbox_t' - event_type = 'kevent_t' + pipe_struct = '_k_pipe_struct' + pipe_type = 'kpipe_t' + map_struct = '_k_mem_map_struct' + map_type = 'kmemory_map_t' + fifo_struct = '_k_fifo_struct' + fifo_type = 'kfifo_t' + mbox_struct = '_k_mbox_struct' + mbox_type = 'kmbox_t' + event_type = 'kevent_t' # add missing object types else: mutex_struct = 'k_mutex' mutex_type = 'struct k_mutex *' sem_struct = 'k_sem' sem_type = 'struct k_sem *' - pipe_struct = 'k_pipe' - pipe_type = 'struct k_pipe *' - map_struct = 'k_mem_map' - map_type = 'struct k_mem_map *' - fifo_struct = 'k_msgq' - fifo_type = 'struct k_msgq *' - mbox_struct = 'k_mbox' - mbox_type = 'struct k_mbox *' - event_type = 'struct k_event *' - mem_pool_type = 'struct k_mem_pool' + pipe_struct = 'k_pipe' + pipe_type = 'struct k_pipe *' + map_struct = 'k_mem_map' + map_type = 'struct k_mem_map *' + fifo_struct = 'k_msgq' + fifo_type = 'struct k_msgq *' + mbox_struct = 'k_mbox' + mbox_type = 'struct k_mbox *' + event_type = 'struct k_event *' + mem_pool_type = 'struct k_mem_pool' # add missing object types # mutex object ids |