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

more cleanup

Browse Source
This commit is contained in:
Markus Fröschle
2014-01-02 10:35:56 +00:00
parent a223dd3b89
commit dd60e17b18
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/video.h
View File

@@ -6,4 +6,6 @@
#include <stdbool.h> #include <stdbool.h>
#include "bas_printf.h" #include "bas_printf.h"
extern void video_init(void);
#endif /* _VIDEO_H_ */ #endif /* _VIDEO_H_ */

14
sys/sysinit.c
View File

@@ -50,6 +50,7 @@
#include "pci_ids.h" #include "pci_ids.h"
#include "driver_mem.h" #include "driver_mem.h"
#include "usb.h" #include "usb.h"
#include "video.h"
#define UNUSED(x) (void)(x) /* Unused variable */ #define UNUSED(x) (void)(x) /* Unused variable */
@@ -204,13 +205,9 @@ void init_gpio(void)
MCF_PAD_PAR_TIMER_PAR_TIN2(MCF_PAD_PAR_TIMER_PAR_TIN2_IRQ2) | MCF_PAD_PAR_TIMER_PAR_TIN2(MCF_PAD_PAR_TIMER_PAR_TIN2_IRQ2) |
MCF_PAD_PAR_TIMER_PAR_TOUT2; MCF_PAD_PAR_TIMER_PAR_TOUT2;
// MCF_PAD_PAR_TIMER = 0b00101101; TIN3..2=#IRQ3..2;TOUT3..2=NORMAL #if defined(MACHINE_FIREBEE)
// ALLE OUTPUTS NORMAL LOW
// ALLE DIR NORMAL INPUT = 0
/* /*
* Configure GPIO FEC1L port directions * Configure GPIO FEC1L port directions (needed to load FPGA configuration)
*/ */
MCF_GPIO_PDDR_FEC1L = 0 | /* bit 7 = input */ MCF_GPIO_PDDR_FEC1L = 0 | /* bit 7 = input */
0 | /* bit 6 = input */ 0 | /* bit 6 = input */
@@ -220,6 +217,7 @@ void init_gpio(void)
MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L2 | /* bit 2 = FPGA_CONFIG => output */ MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L2 | /* bit 2 = FPGA_CONFIG => output */
MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L1 | /* bit 1 = PRG_CLK (FPGA) => output */ MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L1 | /* bit 1 = PRG_CLK (FPGA) => output */
0; /* bit 0 => input */ 0; /* bit 0 => input */
#endif /* MACHINE_FIREBEE */
} }
/* /*
@@ -587,7 +585,7 @@ void init_usb(void)
extern struct pci_device_id ehci_usb_pci_table[]; extern struct pci_device_id ehci_usb_pci_table[];
struct pci_device_id *board; struct pci_device_id *board;
int32_t handle; int32_t handle;
bool usb_found; int usb_found = 0;
int index = 0; int index = 0;
xprintf("USB controller initialization:\r\n"); xprintf("USB controller initialization:\r\n");
@@ -1108,7 +1106,7 @@ void initialize_hardware(void)
/* experimental */ /* experimental */
{ {
int i; int i;
uint32_t *scradr = 0xd00000; uint32_t *scradr = (uint32_t *) 0xd00000;
for (i = 0; i < 100; i++) for (i = 0; i < 100; i++)
{ {