Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed formatting

Browse Source
This commit is contained in:
Markus Fröschle
2015-01-07 13:54:35 +00:00
parent 1ca15ed48b
commit 19c8636eae
4 changed files with 64 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaS_gcc.files
View File

@@ -191,3 +191,7 @@ tos/vmem_test/sources/printf_helper.S
tos/vmem_test/sources/vmem_test.c tos/vmem_test/sources/vmem_test.c
sys/startcf.S sys/startcf.S
sys/exceptions.S sys/exceptions.S
util/bas_printf.c
util/bas_string.c
util/printf_helper.S
util/wait.c

3
include/i2c-algo-bit.h
View File

@@ -32,7 +32,8 @@
* manipulate the line states, and to init any hw-specific features. This is * manipulate the line states, and to init any hw-specific features. This is
* only used if you have more than one hw-type of adapter running. * only used if you have more than one hw-type of adapter running.
*/ */
struct i2c_algo_bit_data { struct i2c_algo_bit_data
{
void *data; /* private data for lowlevel routines */ void *data; /* private data for lowlevel routines */
void (*setsda) (void *data, int state); void (*setsda) (void *data, int state);
void (*setscl) (void *data, int state); void (*setscl) (void *data, int state);

9
include/i2c.h
View File

@@ -44,7 +44,8 @@ extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
* be addressed using the same bus algorithms - i.e. bit-banging or the PCF8584 * be addressed using the same bus algorithms - i.e. bit-banging or the PCF8584
* to name two of the most common. * to name two of the most common.
*/ */
struct i2c_algorithm { struct i2c_algorithm
{
unsigned int id; unsigned int id;
int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, int num); int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, int num);
/* --- ioctl like call to set div. parameters. */ /* --- ioctl like call to set div. parameters. */
@@ -55,7 +56,8 @@ struct i2c_algorithm {
* i2c_adapter is the structure used to identify a physical i2c bus along * i2c_adapter is the structure used to identify a physical i2c bus along
* with the access algorithms necessary to access it. * with the access algorithms necessary to access it.
*/ */
struct i2c_adapter { struct i2c_adapter
{
struct i2c_algorithm *algo; /* the algorithm to access the bus */ struct i2c_algorithm *algo; /* the algorithm to access the bus */
void *algo_data; void *algo_data;
int timeout; int timeout;
@@ -66,7 +68,8 @@ struct i2c_adapter {
/* /*
* I2C Message - used for pure i2c transaction, also from /dev interface * I2C Message - used for pure i2c transaction, also from /dev interface
*/ */
struct i2c_msg { struct i2c_msg
{
unsigned short addr; /* slave address */ unsigned short addr; /* slave address */
unsigned short flags; unsigned short flags;
#define I2C_M_TEN 0x10 /* we have a ten bit chip address */ #define I2C_M_TEN 0x10 /* we have a ten bit chip address */

16
sys/exceptions.S
View File

@@ -225,7 +225,7 @@ init_vec_loop:
move.l a1,(INT_SOURCE_XLBPCI + 64) * 4(a0) move.l a1,(INT_SOURCE_XLBPCI + 64) * 4(a0)
#ifndef MACHINE_FIREBEE #ifndef MACHINE_FIREBEE
// FEC1 not wired on the FireBee, but used on other machines // FEC1 not wired on the FireBee (used for FPGA as GPIO), but used on other machines
move.l a1,(INT_SOURCE_FEC1 + 64) * 4(a0) move.l a1,(INT_SOURCE_FEC1 + 64) * 4(a0)
#endif #endif
@@ -234,6 +234,7 @@ init_vec_loop:
move.l (sp)+,a2 // Restore registers move.l (sp)+,a2 // Restore registers
rts rts
/* /*
* exception vector routines * exception vector routines
*/ */
@@ -402,16 +403,16 @@ irq7:
irq 0x7c,7,0x80 // IRQ7 irq 0x7c,7,0x80 // IRQ7
mfp_irq1: mfp_irq1:
irq 0x104,1,0x02 // IRQ1 irq 0x104,1,0x02 // MFP IRQ1
mfp_irq2: mfp_irq2:
irq 0x108,2,0x04 // IRQ2 irq 0x108,2,0x04 // MFP IRQ2
mfp_irq3: mfp_irq3:
irq 0x10c,3,0x08 // IRQ3 irq 0x10c,3,0x08 // MFP IRQ3
mfp_irq4: mfp_irq4:
irq 0x110,4,0x10 // IRQ4 irq 0x110,4,0x10 // MFP IRQ4
#if MACHINE_M5484LITE_notyet // handlers for M5484LITE #if MACHINE_M5484LITE_notyet // handlers for M5484LITE
@@ -684,6 +685,11 @@ mfp_irq7:
* when the video base address gets changed * when the video base address gets changed
*/ */
/*
* TODO: remove. This interrupt still fires, but doesn't do anything anymore.
* BaS_gcc handles FPGA RAM as STRAM, so there is no page copy necessary as
* it was with previous versions.
*/
handler_gpt0: handler_gpt0:
.extern _gpt0_interrupt_handler .extern _gpt0_interrupt_handler