Skip to content

Commit b898916

Browse files
soypatdeadprogram
soypat
authored and
deadprogram
committed
rp2350 cleanup: unexport internal USB and clock package variable, consts and types
1 parent 5298379 commit b898916

6 files changed

+138
-138
lines changed

‎src/machine/machine_rp2040_rtc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func toAlarmTime(delay uint32) rtcTime {
9797

9898
func (rtc *rtcType) setDivider() {
9999
// Get clk_rtc freq and make sure it is running
100-
rtcFreq := configuredFreq[ClkRTC]
100+
rtcFreq := configuredFreq[clkRTC]
101101
if rtcFreq == 0 {
102102
panic("can not set RTC divider, clock is not running")
103103
}

‎src/machine/machine_rp2040_usb.go

+41-41
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (dev *USBDevice) Configure(config UARTConfig) {
2525
unresetBlockWait(rp.RESETS_RESET_USBCTRL)
2626

2727
// Clear any previous state in dpram just in case
28-
usbDPSRAM.clear()
28+
_usbDPSRAM.clear()
2929

3030
// Enable USB interrupt at processor
3131
rp.USBCTRL_REGS.INTE.Set(0)
@@ -62,7 +62,7 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
6262
// Setup packet received
6363
if (status & rp.USBCTRL_REGS_INTS_SETUP_REQ) > 0 {
6464
rp.USBCTRL_REGS.SIE_STATUS.Set(rp.USBCTRL_REGS_SIE_STATUS_SETUP_REC)
65-
setup := usb.NewSetup(usbDPSRAM.setupBytes())
65+
setup := usb.NewSetup(_usbDPSRAM.setupBytes())
6666

6767
ok := false
6868
if (setup.BmRequestType & usb.REQUEST_TYPE) == usb.REQUEST_STANDARD {
@@ -136,34 +136,34 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
136136

137137
func initEndpoint(ep, config uint32) {
138138
val := uint32(usbEpControlEnable) | uint32(usbEpControlInterruptPerBuff)
139-
offset := ep*2*USBBufferLen + 0x100
139+
offset := ep*2*usbBufferLen + 0x100
140140
val |= offset
141141

142142
switch config {
143143
case usb.ENDPOINT_TYPE_INTERRUPT | usb.EndpointIn:
144144
val |= usbEpControlEndpointTypeInterrupt
145-
usbDPSRAM.EPxControl[ep].In.Set(val)
145+
_usbDPSRAM.EPxControl[ep].In.Set(val)
146146

147147
case usb.ENDPOINT_TYPE_BULK | usb.EndpointOut:
148148
val |= usbEpControlEndpointTypeBulk
149-
usbDPSRAM.EPxControl[ep].Out.Set(val)
150-
usbDPSRAM.EPxBufferControl[ep].Out.Set(USBBufferLen & usbBuf0CtrlLenMask)
151-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
149+
_usbDPSRAM.EPxControl[ep].Out.Set(val)
150+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBufferLen & usbBuf0CtrlLenMask)
151+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
152152

153153
case usb.ENDPOINT_TYPE_INTERRUPT | usb.EndpointOut:
154154
val |= usbEpControlEndpointTypeInterrupt
155-
usbDPSRAM.EPxControl[ep].Out.Set(val)
156-
usbDPSRAM.EPxBufferControl[ep].Out.Set(USBBufferLen & usbBuf0CtrlLenMask)
157-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
155+
_usbDPSRAM.EPxControl[ep].Out.Set(val)
156+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBufferLen & usbBuf0CtrlLenMask)
157+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
158158

159159
case usb.ENDPOINT_TYPE_BULK | usb.EndpointIn:
160160
val |= usbEpControlEndpointTypeBulk
161-
usbDPSRAM.EPxControl[ep].In.Set(val)
161+
_usbDPSRAM.EPxControl[ep].In.Set(val)
162162

163163
case usb.ENDPOINT_TYPE_CONTROL:
164164
val |= usbEpControlEndpointTypeControl
165-
usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBuf0CtrlData1Pid)
166-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
165+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBuf0CtrlData1Pid)
166+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
167167

168168
}
169169
}
@@ -219,37 +219,37 @@ func ReceiveUSBControlPacket() ([cdcLineInfoSize]byte, error) {
219219
var b [cdcLineInfoSize]byte
220220
ep := 0
221221

222-
for !usbDPSRAM.EPxBufferControl[ep].Out.HasBits(usbBuf0CtrlFull) {
222+
for !_usbDPSRAM.EPxBufferControl[ep].Out.HasBits(usbBuf0CtrlFull) {
223223
// TODO: timeout
224224
}
225225

226-
ctrl := usbDPSRAM.EPxBufferControl[ep].Out.Get()
227-
usbDPSRAM.EPxBufferControl[ep].Out.Set(USBBufferLen & usbBuf0CtrlLenMask)
226+
ctrl := _usbDPSRAM.EPxBufferControl[ep].Out.Get()
227+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBufferLen & usbBuf0CtrlLenMask)
228228
sz := ctrl & usbBuf0CtrlLenMask
229229

230-
copy(b[:], usbDPSRAM.EPxBuffer[ep].Buffer0[:sz])
230+
copy(b[:], _usbDPSRAM.EPxBuffer[ep].Buffer0[:sz])
231231

232-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlData1Pid)
233-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
232+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlData1Pid)
233+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
234234

235235
return b, nil
236236
}
237237

238238
func handleEndpointRx(ep uint32) []byte {
239-
ctrl := usbDPSRAM.EPxBufferControl[ep].Out.Get()
240-
usbDPSRAM.EPxBufferControl[ep].Out.Set(USBBufferLen & usbBuf0CtrlLenMask)
239+
ctrl := _usbDPSRAM.EPxBufferControl[ep].Out.Get()
240+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBufferLen & usbBuf0CtrlLenMask)
241241
sz := ctrl & usbBuf0CtrlLenMask
242242

243-
return usbDPSRAM.EPxBuffer[ep].Buffer0[:sz]
243+
return _usbDPSRAM.EPxBuffer[ep].Buffer0[:sz]
244244
}
245245

246246
func handleEndpointRxComplete(ep uint32) {
247247
epXdata0[ep] = !epXdata0[ep]
248248
if epXdata0[ep] || ep == 0 {
249-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlData1Pid)
249+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlData1Pid)
250250
}
251251

252-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
252+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
253253
}
254254

255255
func SendZlp() {
@@ -269,8 +269,8 @@ func sendViaEPIn(ep uint32, data []byte, count int) {
269269
// Mark as full
270270
val |= usbBuf0CtrlFull
271271

272-
copy(usbDPSRAM.EPxBuffer[ep&0x7F].Buffer0[:], data[:count])
273-
usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
272+
copy(_usbDPSRAM.EPxBuffer[ep&0x7F].Buffer0[:], data[:count])
273+
_usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
274274
}
275275

276276
func sendStallViaEPIn(ep uint32) {
@@ -279,41 +279,41 @@ func sendStallViaEPIn(ep uint32) {
279279
rp.USBCTRL_REGS.EP_STALL_ARM.Set(rp.USBCTRL_REGS_EP_STALL_ARM_EP0_IN)
280280
}
281281
val := uint32(usbBuf0CtrlFull)
282-
usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
282+
_usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
283283
val |= uint32(usbBuf0CtrlStall)
284-
usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
284+
_usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
285285
}
286286

287-
type USBDPSRAM struct {
287+
type usbDPSRAM struct {
288288
// Note that EPxControl[0] is not EP0Control but 8-byte setup data.
289-
EPxControl [16]USBEndpointControlRegister
289+
EPxControl [16]usbEndpointControlRegister
290290

291-
EPxBufferControl [16]USBBufferControlRegister
291+
EPxBufferControl [16]usbBufferControlRegister
292292

293-
EPxBuffer [16]USBBuffer
293+
EPxBuffer [16]usbBuffer
294294
}
295295

296-
type USBEndpointControlRegister struct {
296+
type usbEndpointControlRegister struct {
297297
In volatile.Register32
298298
Out volatile.Register32
299299
}
300-
type USBBufferControlRegister struct {
300+
type usbBufferControlRegister struct {
301301
In volatile.Register32
302302
Out volatile.Register32
303303
}
304304

305-
type USBBuffer struct {
306-
Buffer0 [USBBufferLen]byte
307-
Buffer1 [USBBufferLen]byte
305+
type usbBuffer struct {
306+
Buffer0 [usbBufferLen]byte
307+
Buffer1 [usbBufferLen]byte
308308
}
309309

310310
var (
311-
usbDPSRAM = (*USBDPSRAM)(unsafe.Pointer(uintptr(0x50100000)))
311+
_usbDPSRAM = (*usbDPSRAM)(unsafe.Pointer(uintptr(0x50100000)))
312312
epXdata0 [16]bool
313313
setupBytes [8]byte
314314
)
315315

316-
func (d *USBDPSRAM) setupBytes() []byte {
316+
func (d *usbDPSRAM) setupBytes() []byte {
317317

318318
data := d.EPxControl[usb.CONTROL_ENDPOINT].In.Get()
319319
setupBytes[0] = byte(data)
@@ -330,7 +330,7 @@ func (d *USBDPSRAM) setupBytes() []byte {
330330
return setupBytes[:]
331331
}
332332

333-
func (d *USBDPSRAM) clear() {
333+
func (d *usbDPSRAM) clear() {
334334
for i := 0; i < len(d.EPxControl); i++ {
335335
d.EPxControl[i].In.Set(0)
336336
d.EPxControl[i].Out.Set(0)
@@ -373,5 +373,5 @@ const (
373373
usbBuf0CtrlAvail = 0x00000400
374374
usbBuf0CtrlLenMask = 0x000003FF
375375

376-
USBBufferLen = 64
376+
usbBufferLen = 64
377377
)

‎src/machine/machine_rp2350_usb.go

+41-41
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (dev *USBDevice) Configure(config UARTConfig) {
2525
unresetBlockWait(rp.RESETS_RESET_USBCTRL)
2626

2727
// Clear any previous state in dpram just in case
28-
usbDPSRAM.clear()
28+
_usbDPSRAM.clear()
2929

3030
// Enable USB interrupt at processor
3131
rp.USB.INTE.Set(0)
@@ -65,7 +65,7 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
6565
// Setup packet received
6666
if (status & rp.USB_INTS_SETUP_REQ) > 0 {
6767
rp.USB.SIE_STATUS.Set(rp.USB_SIE_STATUS_SETUP_REC)
68-
setup := usb.NewSetup(usbDPSRAM.setupBytes())
68+
setup := usb.NewSetup(_usbDPSRAM.setupBytes())
6969

7070
ok := false
7171
if (setup.BmRequestType & usb.REQUEST_TYPE) == usb.REQUEST_STANDARD {
@@ -139,34 +139,34 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
139139

140140
func initEndpoint(ep, config uint32) {
141141
val := uint32(usbEpControlEnable) | uint32(usbEpControlInterruptPerBuff)
142-
offset := ep*2*USBBufferLen + 0x100
142+
offset := ep*2*usbBufferLen + 0x100
143143
val |= offset
144144

145145
switch config {
146146
case usb.ENDPOINT_TYPE_INTERRUPT | usb.EndpointIn:
147147
val |= usbEpControlEndpointTypeInterrupt
148-
usbDPSRAM.EPxControl[ep].In.Set(val)
148+
_usbDPSRAM.EPxControl[ep].In.Set(val)
149149

150150
case usb.ENDPOINT_TYPE_BULK | usb.EndpointOut:
151151
val |= usbEpControlEndpointTypeBulk
152-
usbDPSRAM.EPxControl[ep].Out.Set(val)
153-
usbDPSRAM.EPxBufferControl[ep].Out.Set(USBBufferLen & usbBuf0CtrlLenMask)
154-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
152+
_usbDPSRAM.EPxControl[ep].Out.Set(val)
153+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBufferLen & usbBuf0CtrlLenMask)
154+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
155155

156156
case usb.ENDPOINT_TYPE_INTERRUPT | usb.EndpointOut:
157157
val |= usbEpControlEndpointTypeInterrupt
158-
usbDPSRAM.EPxControl[ep].Out.Set(val)
159-
usbDPSRAM.EPxBufferControl[ep].Out.Set(USBBufferLen & usbBuf0CtrlLenMask)
160-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
158+
_usbDPSRAM.EPxControl[ep].Out.Set(val)
159+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBufferLen & usbBuf0CtrlLenMask)
160+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
161161

162162
case usb.ENDPOINT_TYPE_BULK | usb.EndpointIn:
163163
val |= usbEpControlEndpointTypeBulk
164-
usbDPSRAM.EPxControl[ep].In.Set(val)
164+
_usbDPSRAM.EPxControl[ep].In.Set(val)
165165

166166
case usb.ENDPOINT_TYPE_CONTROL:
167167
val |= usbEpControlEndpointTypeControl
168-
usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBuf0CtrlData1Pid)
169-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
168+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBuf0CtrlData1Pid)
169+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
170170

171171
}
172172
}
@@ -222,37 +222,37 @@ func ReceiveUSBControlPacket() ([cdcLineInfoSize]byte, error) {
222222
var b [cdcLineInfoSize]byte
223223
ep := 0
224224

225-
for !usbDPSRAM.EPxBufferControl[ep].Out.HasBits(usbBuf0CtrlFull) {
225+
for !_usbDPSRAM.EPxBufferControl[ep].Out.HasBits(usbBuf0CtrlFull) {
226226
// TODO: timeout
227227
}
228228

229-
ctrl := usbDPSRAM.EPxBufferControl[ep].Out.Get()
230-
usbDPSRAM.EPxBufferControl[ep].Out.Set(USBBufferLen & usbBuf0CtrlLenMask)
229+
ctrl := _usbDPSRAM.EPxBufferControl[ep].Out.Get()
230+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBufferLen & usbBuf0CtrlLenMask)
231231
sz := ctrl & usbBuf0CtrlLenMask
232232

233-
copy(b[:], usbDPSRAM.EPxBuffer[ep].Buffer0[:sz])
233+
copy(b[:], _usbDPSRAM.EPxBuffer[ep].Buffer0[:sz])
234234

235-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlData1Pid)
236-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
235+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlData1Pid)
236+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
237237

238238
return b, nil
239239
}
240240

241241
func handleEndpointRx(ep uint32) []byte {
242-
ctrl := usbDPSRAM.EPxBufferControl[ep].Out.Get()
243-
usbDPSRAM.EPxBufferControl[ep].Out.Set(USBBufferLen & usbBuf0CtrlLenMask)
242+
ctrl := _usbDPSRAM.EPxBufferControl[ep].Out.Get()
243+
_usbDPSRAM.EPxBufferControl[ep].Out.Set(usbBufferLen & usbBuf0CtrlLenMask)
244244
sz := ctrl & usbBuf0CtrlLenMask
245245

246-
return usbDPSRAM.EPxBuffer[ep].Buffer0[:sz]
246+
return _usbDPSRAM.EPxBuffer[ep].Buffer0[:sz]
247247
}
248248

249249
func handleEndpointRxComplete(ep uint32) {
250250
epXdata0[ep] = !epXdata0[ep]
251251
if epXdata0[ep] || ep == 0 {
252-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlData1Pid)
252+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlData1Pid)
253253
}
254254

255-
usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
255+
_usbDPSRAM.EPxBufferControl[ep].Out.SetBits(usbBuf0CtrlAvail)
256256
}
257257

258258
func SendZlp() {
@@ -272,8 +272,8 @@ func sendViaEPIn(ep uint32, data []byte, count int) {
272272
// Mark as full
273273
val |= usbBuf0CtrlFull
274274

275-
copy(usbDPSRAM.EPxBuffer[ep&0x7F].Buffer0[:], data[:count])
276-
usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
275+
copy(_usbDPSRAM.EPxBuffer[ep&0x7F].Buffer0[:], data[:count])
276+
_usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
277277
}
278278

279279
func sendStallViaEPIn(ep uint32) {
@@ -282,41 +282,41 @@ func sendStallViaEPIn(ep uint32) {
282282
rp.USB.EP_STALL_ARM.Set(rp.USB_EP_STALL_ARM_EP0_IN)
283283
}
284284
val := uint32(usbBuf0CtrlFull)
285-
usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
285+
_usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
286286
val |= uint32(usbBuf0CtrlStall)
287-
usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
287+
_usbDPSRAM.EPxBufferControl[ep&0x7F].In.Set(val)
288288
}
289289

290-
type USBDPSRAM struct {
290+
type usbDPSRAM struct {
291291
// Note that EPxControl[0] is not EP0Control but 8-byte setup data.
292-
EPxControl [16]USBEndpointControlRegister
292+
EPxControl [16]usbEndpointControlRegister
293293

294-
EPxBufferControl [16]USBBufferControlRegister
294+
EPxBufferControl [16]usbBufferControlRegister
295295

296-
EPxBuffer [16]USBBuffer
296+
EPxBuffer [16]usbBuffer
297297
}
298298

299-
type USBEndpointControlRegister struct {
299+
type usbEndpointControlRegister struct {
300300
In volatile.Register32
301301
Out volatile.Register32
302302
}
303-
type USBBufferControlRegister struct {
303+
type usbBufferControlRegister struct {
304304
In volatile.Register32
305305
Out volatile.Register32
306306
}
307307

308-
type USBBuffer struct {
309-
Buffer0 [USBBufferLen]byte
310-
Buffer1 [USBBufferLen]byte
308+
type usbBuffer struct {
309+
Buffer0 [usbBufferLen]byte
310+
Buffer1 [usbBufferLen]byte
311311
}
312312

313313
var (
314-
usbDPSRAM = (*USBDPSRAM)(unsafe.Pointer(uintptr(0x50100000)))
314+
_usbDPSRAM = (*usbDPSRAM)(unsafe.Pointer(uintptr(0x50100000)))
315315
epXdata0 [16]bool
316316
setupBytes [8]byte
317317
)
318318

319-
func (d *USBDPSRAM) setupBytes() []byte {
319+
func (d *usbDPSRAM) setupBytes() []byte {
320320

321321
data := d.EPxControl[usb.CONTROL_ENDPOINT].In.Get()
322322
setupBytes[0] = byte(data)
@@ -333,7 +333,7 @@ func (d *USBDPSRAM) setupBytes() []byte {
333333
return setupBytes[:]
334334
}
335335

336-
func (d *USBDPSRAM) clear() {
336+
func (d *usbDPSRAM) clear() {
337337
for i := 0; i < len(d.EPxControl); i++ {
338338
d.EPxControl[i].In.Set(0)
339339
d.EPxControl[i].Out.Set(0)
@@ -376,5 +376,5 @@ const (
376376
usbBuf0CtrlAvail = 0x00000400
377377
usbBuf0CtrlLenMask = 0x000003FF
378378

379-
USBBufferLen = 64
379+
usbBufferLen = 64
380380
)

0 commit comments

Comments
 (0)