From 06e11f9482d6b3bf954c53b36d785dad04d2f336 Mon Sep 17 00:00:00 2001
From: hexkyz <mike.hexkyz@gmail.com>
Date: Tue, 13 Feb 2018 19:26:20 +0000
Subject: [PATCH] Fix up indentation
---
audio/playtone/Makefile | 120 +++++++++++++++++------------------
audio/playtone/source/main.c | 84 ++++++++++++------------
2 files changed, 102 insertions(+), 102 deletions(-)
diff --git a/audio/playtone/Makefile b/audio/playtone/Makefile
index 069b24d..ead4ea6 100644
--- a/audio/playtone/Makefile
+++ b/audio/playtone/Makefile
@@ -29,36 +29,36 @@ include $(DEVKITPRO)/libnx/switch_rules
# - icon.jpg
# - <libnx folder>/default_icon.jpg
#---------------------------------------------------------------------------------
-TARGET := $(notdir $(CURDIR))
-BUILD := build
-SOURCES := source
-DATA := data
-INCLUDES := include
-EXEFS_SRC := exefs_src
+TARGET := $(notdir $(CURDIR))
+BUILD := build
+SOURCES := source
+DATA := data
+INCLUDES := include
+EXEFS_SRC := exefs_src
#---------------------------------------------------------------------------------
# options for code generation
#---------------------------------------------------------------------------------
-ARCH := -march=armv8-a -mtp=soft -fPIE
+ARCH := -march=armv8-a -mtp=soft -fPIE
-CFLAGS := -g -Wall -O2 \
- -ffast-math \
- $(ARCH) $(DEFINES)
+CFLAGS := -g -Wall -O2 \
+ -ffast-math \
+ $(ARCH) $(DEFINES)
-CFLAGS += $(INCLUDE) -DSWITCH
+CFLAGS += $(INCLUDE) -DSWITCH
-CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
-ASFLAGS := -g $(ARCH)
-LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+ASFLAGS := -g $(ARCH)
+LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-LIBS := -lnx -lm
+LIBS := -lnx -lm
#---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing
# include and lib
#---------------------------------------------------------------------------------
-LIBDIRS := $(PORTLIBS) $(LIBNX)
+LIBDIRS := $(PORTLIBS) $(LIBNX)
#---------------------------------------------------------------------------------
@@ -68,67 +68,67 @@ LIBDIRS := $(PORTLIBS) $(LIBNX)
ifneq ($(BUILD),$(notdir $(CURDIR)))
#---------------------------------------------------------------------------------
-export OUTPUT := $(CURDIR)/$(TARGET)
-export TOPDIR := $(CURDIR)
+export OUTPUT := $(CURDIR)/$(TARGET)
+export TOPDIR := $(CURDIR)
-export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
- $(foreach dir,$(DATA),$(CURDIR)/$(dir))
+export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+ $(foreach dir,$(DATA),$(CURDIR)/$(dir))
-export DEPSDIR := $(CURDIR)/$(BUILD)
+export DEPSDIR := $(CURDIR)/$(BUILD)
-CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
#---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C
#---------------------------------------------------------------------------------
ifeq ($(strip $(CPPFILES)),)
#---------------------------------------------------------------------------------
- export LD := $(CC)
+ export LD := $(CC)
#---------------------------------------------------------------------------------
else
#---------------------------------------------------------------------------------
- export LD := $(CXX)
+ export LD := $(CXX)
#---------------------------------------------------------------------------------
endif
#---------------------------------------------------------------------------------
-export OFILES := $(addsuffix .o,$(BINFILES)) \
- $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES := $(addsuffix .o,$(BINFILES)) \
+ $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
- $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
- -I$(CURDIR)/$(BUILD)
+export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+ -I$(CURDIR)/$(BUILD)
-export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
ifeq ($(strip $(ICON)),)
- icons := $(wildcard *.jpg)
- ifneq (,$(findstring $(TARGET).jpg,$(icons)))
- export APP_ICON := $(TOPDIR)/$(TARGET).jpg
- else
- ifneq (,$(findstring icon.jpg,$(icons)))
- export APP_ICON := $(TOPDIR)/icon.jpg
- endif
- endif
+ icons := $(wildcard *.jpg)
+ ifneq (,$(findstring $(TARGET).jpg,$(icons)))
+ export APP_ICON := $(TOPDIR)/$(TARGET).jpg
+ else
+ ifneq (,$(findstring icon.jpg,$(icons)))
+ export APP_ICON := $(TOPDIR)/icon.jpg
+ endif
+ endif
else
- export APP_ICON := $(TOPDIR)/$(ICON)
+ export APP_ICON := $(TOPDIR)/$(ICON)
endif
ifeq ($(strip $(NO_ICON)),)
- export NROFLAGS += --icon=$(APP_ICON)
+ export NROFLAGS += --icon=$(APP_ICON)
endif
ifeq ($(strip $(NO_NACP)),)
- export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
+ export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
endif
ifneq ($(APP_TITLEID),)
- export NACPFLAGS += --titleid=$(APP_TITLEID)
+ export NACPFLAGS += --titleid=$(APP_TITLEID)
endif
.PHONY: $(BUILD) clean all
@@ -137,45 +137,45 @@ endif
all: $(BUILD)
$(BUILD):
- @[ -d $@ ] || mkdir -p $@
- @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+ @[ -d $@ ] || mkdir -p $@
+ @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
#---------------------------------------------------------------------------------
clean:
- @echo clean ...
- @rm -fr $(BUILD) $(TARGET).pfs0 $(TARGET).nso $(TARGET).nro $(TARGET).nacp $(TARGET).elf
+ @echo clean ...
+ @rm -fr $(BUILD) $(TARGET).pfs0 $(TARGET).nso $(TARGET).nro $(TARGET).nacp $(TARGET).elf
#---------------------------------------------------------------------------------
else
-.PHONY: all
+.PHONY: all
-DEPENDS := $(OFILES:.o=.d)
+DEPENDS := $(OFILES:.o=.d)
#---------------------------------------------------------------------------------
# main targets
#---------------------------------------------------------------------------------
-all : $(OUTPUT).pfs0 $(OUTPUT).nro
+all : $(OUTPUT).pfs0 $(OUTPUT).nro
-$(OUTPUT).pfs0 : $(OUTPUT).nso
+$(OUTPUT).pfs0 : $(OUTPUT).nso
-$(OUTPUT).nso : $(OUTPUT).elf
+$(OUTPUT).nso : $(OUTPUT).elf
ifeq ($(strip $(NO_NACP)),)
-$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp
+$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp
else
-$(OUTPUT).nro : $(OUTPUT).elf
+$(OUTPUT).nro : $(OUTPUT).elf
endif
-$(OUTPUT).elf : $(OFILES)
+$(OUTPUT).elf : $(OFILES)
#---------------------------------------------------------------------------------
# you need a rule like this for each extension you use as binary data
#---------------------------------------------------------------------------------
-%.bin.o : %.bin
+%.bin.o : %.bin
#---------------------------------------------------------------------------------
- @echo $(notdir $<)
- @$(bin2o)
+ @echo $(notdir $<)
+ @$(bin2o)
-include $(DEPENDS)
diff --git a/audio/playtone/source/main.c b/audio/playtone/source/main.c
index d2a1ebc..d4283df 100644
--- a/audio/playtone/source/main.c
+++ b/audio/playtone/source/main.c
@@ -8,50 +8,50 @@
#define SAMPLESPERBUF (SAMPLERATE / 10)
void fill_audio_buffer(void* audio_buffer, size_t offset, size_t size, int frequency) {
- u32* dest = (u32*) audio_buffer;
+ u32* dest = (u32*) audio_buffer;
- for (int i = 0; i < size; i++) {
- // This is a simple sine wave, with a frequency of `frequency` Hz, and an amplitude 30% of maximum.
- s16 sample = 0.3 * 0x7FFF * sin(frequency * (2 * M_PI) * (offset + i) / SAMPLERATE);
+ for (int i = 0; i < size; i++) {
+ // This is a simple sine wave, with a frequency of `frequency` Hz, and an amplitude 30% of maximum.
+ s16 sample = 0.3 * 0x7FFF * sin(frequency * (2 * M_PI) * (offset + i) / SAMPLERATE);
- // Stereo samples are interleaved: left and right channels.
- dest[i] = (sample << 16) | (sample & 0xffff);
- }
+ // Stereo samples are interleaved: left and right channels.
+ dest[i] = (sample << 16) | (sample & 0xffff);
+ }
}
int main(int argc, char **argv)
{
- Result rc = 0;
- Handle event = 0;
+ Result rc = 0;
+ Handle event = 0;
AudioOutBuffer source_buffer;
AudioOutBuffer released_buffer;
int notefreq[] = {
- 220,
- 440, 880, 1760, 3520, 7040,
- 14080,
- 7040, 3520, 1760, 880, 440
- };
+ 220,
+ 440, 880, 1760, 3520, 7040,
+ 14080,
+ 7040, 3520, 1760, 880, 440
+ };
u32 raw_data[SAMPLESPERBUF * 2];
fill_audio_buffer(raw_data, 0, SAMPLESPERBUF * 2, notefreq[4]);
- gfxInitDefault();
+ gfxInitDefault();
- // Initialize console. Using NULL as the second argument tells the console library to use the internal console structure as current one.
- consoleInit(NULL);
+ // Initialize console. Using NULL as the second argument tells the console library to use the internal console structure as current one.
+ consoleInit(NULL);
- rc = audoutInitialize();
- printf("audoutInitialize() returned 0x%x\n", rc);
+ rc = audoutInitialize();
+ printf("audoutInitialize() returned 0x%x\n", rc);
- if (R_SUCCEEDED(rc))
- {
- rc = audoutRegisterBufferEvent(&event);
- printf("audoutRegisterBufferEvent() returned 0x%x\n", rc);
- }
+ if (R_SUCCEEDED(rc))
+ {
+ rc = audoutRegisterBufferEvent(&event);
+ printf("audoutRegisterBufferEvent() returned 0x%x\n", rc);
+ }
- if (R_SUCCEEDED(rc))
- {
+ if (R_SUCCEEDED(rc))
+ {
source_buffer.next = 0;
source_buffer.buffer = raw_data;
source_buffer.buffer_size = sizeof(raw_data);
@@ -60,23 +60,23 @@ int main(int argc, char **argv)
rc = audoutAppendAudioOutBuffer(&source_buffer);
printf("audoutAppendAudioOutBuffer() returned 0x%x\n", rc);
- }
+ }
if (R_SUCCEEDED(rc))
- {
- rc = audoutStartAudioOut();
- printf("audoutStartAudioOut() returned 0x%x\n", rc);
- }
+ {
+ rc = audoutStartAudioOut();
+ printf("audoutStartAudioOut() returned 0x%x\n", rc);
+ }
bool play_tone = false;
printf("Press A, B, Y, X, Left, Up, Right, Down, L, R, ZL or ZR to play a different tone.\n");
- while (appletMainLoop())
- {
- //Scan all the inputs. This should be done once for each frame
- hidScanInput();
+ while (appletMainLoop())
+ {
+ //Scan all the inputs. This should be done once for each frame
+ hidScanInput();
- if (hidKeysDown(CONTROLLER_P1_AUTO) & KEY_PLUS) break;
+ if (hidKeysDown(CONTROLLER_P1_AUTO) & KEY_PLUS) break;
if (hidKeysDown(CONTROLLER_P1_AUTO) & KEY_A)
{
@@ -177,16 +177,16 @@ int main(int argc, char **argv)
}
gfxFlushBuffers();
- gfxSwapBuffers();
- gfxWaitForVsync();
- }
+ gfxSwapBuffers();
+ gfxWaitForVsync();
+ }
rc = audoutStopAudioOut();
printf("audoutStopAudioOut() returned 0x%x\n", rc);
- audoutExit();
+ audoutExit();
- gfxExit();
- return 0;
+ gfxExit();
+ return 0;
}