Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
e8217c2a
Commit
e8217c2a
authored
Nov 01, 2013
by
Damien
Browse files
Remove debugging print for SD card; add comment to possibly-buggy USB code.
parent
c1764e99
Changes
3
Hide whitespace changes
Inline
Side-by-side
stm/lib/stm324x7i_eval_sdio_sd.c
View file @
e8217c2a
...
@@ -414,7 +414,6 @@ SD_Error SD_Init(void)
...
@@ -414,7 +414,6 @@ SD_Error SD_Init(void)
if
(
errorstatus
!=
SD_OK
)
if
(
errorstatus
!=
SD_OK
)
{
{
printf
(
"here1
\n
"
);
/*!< CMD Response TimeOut (wait for CMDSENT flag) */
/*!< CMD Response TimeOut (wait for CMDSENT flag) */
return
(
errorstatus
);
return
(
errorstatus
);
}
}
...
@@ -423,7 +422,6 @@ SD_Error SD_Init(void)
...
@@ -423,7 +422,6 @@ SD_Error SD_Init(void)
if
(
errorstatus
!=
SD_OK
)
if
(
errorstatus
!=
SD_OK
)
{
{
printf
(
"here2
\n
"
);
/*!< CMD Response TimeOut (wait for CMDSENT flag) */
/*!< CMD Response TimeOut (wait for CMDSENT flag) */
return
(
errorstatus
);
return
(
errorstatus
);
}
}
...
@@ -568,7 +566,6 @@ SD_Error SD_PowerON(void)
...
@@ -568,7 +566,6 @@ SD_Error SD_PowerON(void)
SDIO_SendCommand
(
&
SDIO_CmdInitStructure
);
SDIO_SendCommand
(
&
SDIO_CmdInitStructure
);
errorstatus
=
CmdError
();
errorstatus
=
CmdError
();
printf
(
"here pwr 1 %d
\n
"
,
errorstatus
);
if
(
errorstatus
!=
SD_OK
)
if
(
errorstatus
!=
SD_OK
)
{
{
...
@@ -590,7 +587,6 @@ SD_Error SD_PowerON(void)
...
@@ -590,7 +587,6 @@ SD_Error SD_PowerON(void)
SDIO_SendCommand
(
&
SDIO_CmdInitStructure
);
SDIO_SendCommand
(
&
SDIO_CmdInitStructure
);
errorstatus
=
CmdResp7Error
();
errorstatus
=
CmdResp7Error
();
printf
(
"here pwr 2 %d
\n
"
,
errorstatus
);
if
(
errorstatus
==
SD_OK
)
if
(
errorstatus
==
SD_OK
)
{
{
...
@@ -616,7 +612,6 @@ SD_Error SD_PowerON(void)
...
@@ -616,7 +612,6 @@ SD_Error SD_PowerON(void)
SDIO_CmdInitStructure
.
SDIO_CPSM
=
SDIO_CPSM_Enable
;
SDIO_CmdInitStructure
.
SDIO_CPSM
=
SDIO_CPSM_Enable
;
SDIO_SendCommand
(
&
SDIO_CmdInitStructure
);
SDIO_SendCommand
(
&
SDIO_CmdInitStructure
);
errorstatus
=
CmdResp1Error
(
SD_CMD_APP_CMD
);
errorstatus
=
CmdResp1Error
(
SD_CMD_APP_CMD
);
printf
(
"here pwr 3 %d
\n
"
,
errorstatus
);
/*!< If errorstatus is Command TimeOut, it is a MMC card */
/*!< If errorstatus is Command TimeOut, it is a MMC card */
/*!< If errorstatus is SD_OK it is a SD card: SD card 2.0 (voltage range mismatch)
/*!< If errorstatus is SD_OK it is a SD card: SD card 2.0 (voltage range mismatch)
...
...
stm/lib/usb_core.c
View file @
e8217c2a
...
@@ -1961,7 +1961,7 @@ void USB_OTG_ActiveRemoteWakeup(USB_OTG_CORE_HANDLE *pdev)
...
@@ -1961,7 +1961,7 @@ void USB_OTG_ActiveRemoteWakeup(USB_OTG_CORE_HANDLE *pdev)
if
(
pdev
->
cfg
.
low_power
)
if
(
pdev
->
cfg
.
low_power
)
{
{
/* un-gate USB Core clock */
/* un-gate USB Core clock */
power
.
d32
=
USB_OTG_READ_REG32
(
&
pdev
->
regs
.
PCGCCTL
);
power
.
d32
=
USB_OTG_READ_REG32
(
&
pdev
->
regs
.
PCGCCTL
);
// dpgeorge: taking the address here might be wrong...
power
.
b
.
gatehclk
=
0
;
power
.
b
.
gatehclk
=
0
;
power
.
b
.
stoppclk
=
0
;
power
.
b
.
stoppclk
=
0
;
USB_OTG_WRITE_REG32
(
pdev
->
regs
.
PCGCCTL
,
power
.
d32
);
USB_OTG_WRITE_REG32
(
pdev
->
regs
.
PCGCCTL
,
power
.
d32
);
...
@@ -1995,7 +1995,7 @@ void USB_OTG_UngateClock(USB_OTG_CORE_HANDLE *pdev)
...
@@ -1995,7 +1995,7 @@ void USB_OTG_UngateClock(USB_OTG_CORE_HANDLE *pdev)
if
(
dsts
.
b
.
suspsts
==
1
)
if
(
dsts
.
b
.
suspsts
==
1
)
{
{
/* un-gate USB Core clock */
/* un-gate USB Core clock */
power
.
d32
=
USB_OTG_READ_REG32
(
&
pdev
->
regs
.
PCGCCTL
);
power
.
d32
=
USB_OTG_READ_REG32
(
&
pdev
->
regs
.
PCGCCTL
);
// dpgeorge: taking the address here might be wrong...
power
.
b
.
gatehclk
=
0
;
power
.
b
.
gatehclk
=
0
;
power
.
b
.
stoppclk
=
0
;
power
.
b
.
stoppclk
=
0
;
USB_OTG_WRITE_REG32
(
pdev
->
regs
.
PCGCCTL
,
power
.
d32
);
USB_OTG_WRITE_REG32
(
pdev
->
regs
.
PCGCCTL
,
power
.
d32
);
...
...
stm/lib/usb_dcd_int.c
View file @
e8217c2a
...
@@ -352,7 +352,7 @@ static uint32_t DCD_HandleResume_ISR(USB_OTG_CORE_HANDLE *pdev)
...
@@ -352,7 +352,7 @@ static uint32_t DCD_HandleResume_ISR(USB_OTG_CORE_HANDLE *pdev)
if
(
pdev
->
cfg
.
low_power
)
if
(
pdev
->
cfg
.
low_power
)
{
{
/* un-gate USB Core clock */
/* un-gate USB Core clock */
power
.
d32
=
USB_OTG_READ_REG32
(
&
pdev
->
regs
.
PCGCCTL
);
power
.
d32
=
USB_OTG_READ_REG32
(
&
pdev
->
regs
.
PCGCCTL
);
// dpgeorge: taking the address here might be wrong...
power
.
b
.
gatehclk
=
0
;
power
.
b
.
gatehclk
=
0
;
power
.
b
.
stoppclk
=
0
;
power
.
b
.
stoppclk
=
0
;
USB_OTG_WRITE_REG32
(
pdev
->
regs
.
PCGCCTL
,
power
.
d32
);
USB_OTG_WRITE_REG32
(
pdev
->
regs
.
PCGCCTL
,
power
.
d32
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment