Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4c2cfee authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Various cosmetic cleanups.



We had quite a bit of whitespace damage, clean most of it up..

Signed-off-by: default avatarStuart Menefy <stuart.menefy@st.com>
Signed-off-by: default avatarArthur Othieno <a.othieno@bluewin.ch>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent a56d276c
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@
   event.

   There are three 32-bit ESRs located at 0xa05f8900 - 0xa05f6908.  Event
   types can be found in include/asm-sh/dc_sysasic.h.  There are three groups
   of EMRs that parallel the ESRs.  Each EMR group corresponds to an IRQ, so
   0xa05f6910 - 0xa05f6918 triggers IRQ 13, 0xa05f6920 - 0xa05f6928 triggers
   IRQ 11, and 0xa05f6930 - 0xa05f6938 triggers IRQ 9.
   types can be found in include/asm-sh/dreamcast/sysasic.h. There are three
   groups of EMRs that parallel the ESRs.  Each EMR group corresponds to an
   IRQ, so 0xa05f6910 - 0xa05f6918 triggers IRQ 13, 0xa05f6920 - 0xa05f6928
   triggers IRQ 11, and 0xa05f6930 - 0xa05f6938 triggers IRQ 9.

   In the kernel, these events are mapped to virtual IRQs so that drivers can
   respond to them as they would a normal interrupt.  In order to keep this
+9 −9
Original line number Diff line number Diff line
/* arch/sh/kernel/rtc-aica.c
/*
 * arch/sh/boards/dreamcast/rtc.c
 *
 * Dreamcast AICA RTC routines.
 *
@@ -10,15 +11,12 @@
 */

#include <linux/time.h>

#include <asm/rtc.h>
#include <asm/io.h>

extern void (*rtc_get_time)(struct timespec *);
extern int (*rtc_set_time)(const time_t);

/* The AICA RTC has an Epoch of 1/1/1950, so we must subtract 20 years (in
   seconds to get the standard Unix Epoch when getting the time, and add 20
   years when setting the time. */
   seconds) to get the standard Unix Epoch when getting the time, and add
   20 years when setting the time. */
#define TWENTY_YEARS ((20 * 365LU + 5) * 86400)

/* The AICA RTC is represented by a 32-bit seconds counter stored in 2 16-bit
@@ -32,7 +30,8 @@ extern int (*rtc_set_time)(const time_t);
 *
 * Grabs the current RTC seconds counter and adjusts it to the Unix Epoch.
 */
void aica_rtc_gettimeofday(struct timespec *ts) {
void aica_rtc_gettimeofday(struct timespec *ts)
{
	unsigned long val1, val2;

	do {
@@ -55,7 +54,8 @@ void aica_rtc_gettimeofday(struct timespec *ts) {
 *
 * Adjusts the given @tv to the AICA Epoch and sets the RTC seconds counter.
 */
int aica_rtc_settimeofday(const time_t secs) {
int aica_rtc_settimeofday(const time_t secs)
{
	unsigned long val1, val2;
	unsigned long adj = secs + TWENTY_YEARS;

+2 −4
Original line number Diff line number Diff line
@@ -25,18 +25,16 @@

#include <asm/io.h>
#include <asm/irq.h>
#include <asm/rtc.h>
#include <asm/machvec.h>
#include <asm/machvec_init.h>
#include <asm/mach/sysasic.h>

extern struct hw_interrupt_type systemasic_int;
/* XXX: Move this into it's proper header. */
extern void (*board_time_init)(void);
extern void aica_time_init(void);
extern int gapspci_init(void);
extern int systemasic_irq_demux(int);

void *dreamcast_consistent_alloc(struct device *, size_t, dma_addr_t *, int);
void *dreamcast_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
int dreamcast_consistent_free(struct device *, size_t, void *, dma_addr_t);

const char *get_system_type(void)
+0 −4
Original line number Diff line number Diff line
#
# Makefile for the EDOSK7705 specific parts of the kernel
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#

obj-y	 := setup.o io.o
+0 −4
Original line number Diff line number Diff line
#
# Makefile for the HS7751RVoIP specific parts of the kernel
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#

obj-y	 := mach.o setup.o io.o irq.o led.o

Loading