Commit 6d2a16e5 authored by Ben Avison's avatar Ben Avison
Browse files

Whitespace changes

Detail:
  Substituted remaining hard spaces with normal ones and expanded tabs.
  This now matches the de facto standard for other components, and also looks
  better in the CVS web viewer.
Admin:
  No code changes

Version 0.06. Tagged as 'BCM2835-0_06'
parent 464d20b7
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.05"
Module_Version SETA 5
Module_MajorVersion SETS "0.06"
Module_Version SETA 6
Module_MinorVersion SETS ""
Module_Date SETS "24 May 2012"
Module_ApplicationDate SETS "24-May-12"
Module_ComponentName SETS "BCM2835"
Module_ComponentPath SETS "mixed/RiscOS/Sources/HAL/BCM2835"
Module_FullVersion SETS "0.05"
Module_HelpVersion SETS "0.05 (24 May 2012)"
Module_FullVersion SETS "0.06"
Module_HelpVersion SETS "0.06 (24 May 2012)"
END
/* (0.05)
/* (0.06)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.05
#define Module_MajorVersion_CMHG 0.06
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 May 2012
#define Module_MajorVersion "0.05"
#define Module_Version 5
#define Module_MajorVersion "0.06"
#define Module_Version 6
#define Module_MinorVersion ""
#define Module_Date "24 May 2012"
......@@ -18,6 +18,6 @@
#define Module_ComponentName "BCM2835"
#define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835"
#define Module_FullVersion "0.05"
#define Module_HelpVersion "0.05 (24 May 2012)"
#define Module_LibraryVersionInfo "0:5"
#define Module_FullVersion "0.06"
#define Module_HelpVersion "0.06 (24 May 2012)"
#define Module_LibraryVersionInfo "0:6"
......@@ -35,14 +35,14 @@
; - &08000000 -> &7E000000 : 4MB window granting access to peripherals
; - &08800000 -> &7E800000 : 4MB window granting access to USB peripheral
[ :LNOT :DEF: BCM2835_Hdr
GBLL BCM2835_Hdr
[ :LNOT :DEF: BCM2835_Hdr
GBLL BCM2835_Hdr
GBLL HALDebug
HALDebug SETL {TRUE}
GBLL HALDebug
HALDebug SETL {TRUE}
GBLL ExtFramestore
ExtFramestore SETL {TRUE}
GBLL ExtFramestore
ExtFramestore SETL {TRUE}
; set TRUE if using the start.elf originally used for development. FALSE otherwise
GBLL UseALBlob
......@@ -391,22 +391,22 @@ ARM_Timer_Base * &0000b400 ; base of ARM timer regs
; DMA registers
DMA_Base * &00007000 ;
DMA0_CS * 0
DMA0_CONBLK_AD * 4
DMA0_DEBUG * &20
DMA0_CS * 0
DMA0_CONBLK_AD * 4
DMA0_DEBUG * &20
; DMA control block
^ 0
DMAcb_info # 4
DMAcb_src # 4
DMAcb_dst # 4
DMAcb_length # 4
DMAcb_stride # 4
DMAcb_next # 4
DMAcb_pad0 # 4
DMAcb_pad1 # 4
sizeof_DMAcb * @
^ 0
DMAcb_info # 4
DMAcb_src # 4
DMAcb_dst # 4
DMAcb_length # 4
DMAcb_stride # 4
DMAcb_next # 4
DMAcb_pad0 # 4
DMAcb_pad1 # 4
sizeof_DMAcb * @
;
PM_Base * &00100000 ; power management
......@@ -563,4 +563,4 @@ $label MCR$cond p6, 0, $r, c9, c0
MEND
]
END
END
......@@ -30,8 +30,8 @@
; its Linux drivers, thus making this port possible.
;
GET Hdr:OSEntries
GET hdr.BCM2835
GET Hdr:OSEntries
GET hdr.BCM2835
; Per-timer workspace layout
^ 0
......@@ -44,17 +44,17 @@ TimerWsSize * :INDEX: @
; Main workspace layout
sb RN 9
sb RN 9
^ 0,sb
^ 0,sb
PeriBase # 4
PeriBase # 4
IRQ_Base_Address # 4
ARM_Counter_IO_Address # 4
ARM_Timer_IO_Address # 4
UARTFCRSoftCopy # 4
DMAcb # sizeof_DMAcb
DMAcb # sizeof_DMAcb
Timer SETA 0
WHILE Timer < NumTimers
......@@ -79,39 +79,39 @@ myyoff # 4
mbbase # 4
mbscrsz # 4
ScreenBase # 4
FTextPixel # 4
BTextPixel # 4
FTextPixRepl # 4
BTextPixRepl # 4
BitsPerPixel # 4
InvertFont # 4
InvertPixel # 4
Columns # 4
Rows # 4
OutputX # 4
OutputY # 4
BytesPerRow # 4
BytesPerChar # 4
LastInt # 4
KM_State # 4
KM_Num # 4
KM_NumY # 4
PixelTable # 256*4
CurAddr # 4
CurHeight # 4
CurPalette # 4*4
WSPhysAddr # 4 ;physical address of HAL workspace
OSheader # 4
ScreenBase # 4
FTextPixel # 4
BTextPixel # 4
FTextPixRepl # 4
BTextPixRepl # 4
BitsPerPixel # 4
InvertFont # 4
InvertPixel # 4
Columns # 4
Rows # 4
OutputX # 4
OutputY # 4
BytesPerRow # 4
BytesPerChar # 4
LastInt # 4
KM_State # 4
KM_Num # 4
KM_NumY # 4
PixelTable # 256*4
CurAddr # 4
CurHeight # 4
CurPalette # 4*4
WSPhysAddr # 4 ;physical address of HAL workspace
OSheader # 4
OSentries # 4*(HighestOSEntry+1)
CurUnder # 32*4*32
CurShape # 32/4*32
CurUnder # 32*4*32
CurShape # 32/4*32
HAL_WsSize * :INDEX:@
sizeof_workspace * :INDEX:@
HAL_WsSize * :INDEX:@
sizeof_workspace * :INDEX:@
END
END
;
; Copyright (c) 2012, RISC OS Open Ltd
; Copyright (c) 2012, RISC OS Open Ltd
; Copyright (c) 2012, Adrian Lees
; All rights reserved.
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions are met:
......@@ -32,13 +32,13 @@
; not used any longer .. JB 20/2/12
UART011_DR * 0
UART011_RSR * 4
UART011_ECR * 4
UART011_CR * &30
UART011_FR * &18
UART011_FBRD * &28
UART011_IBRD * &24
UART011_LCRH * &2C
UART011_DR * 0
UART011_RSR * 4
UART011_ECR * 4
UART011_CR * &30
UART011_FR * &18
UART011_FBRD * &28
UART011_IBRD * &24
UART011_LCRH * &2C
END
This diff is collapsed.
;
; Copyright (c) 2012, RISC OS Open Ltd
; Copyright (c) 2012, RISC OS Open Ltd
; Copyright (c) 2012, Adrian Lees
; All rights reserved.
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions are met:
......@@ -30,24 +30,24 @@
; its Linux drivers, thus making this port possible.
;
AREA |ARM$$code|, CODE, READONLY, PIC
AREA |ARM$$code|, CODE, READONLY, PIC
IMPORT HAL_UARTLineStatus
IMPORT HAL_UARTTransmitByte
IMPORT HAL_UARTLineStatus
IMPORT HAL_UARTTransmitByte
IMPORT HAL_UARTReceiveByte
EXPORT HAL_DebugTX
EXPORT HAL_DebugTX
EXPORT HAL_DebugRX
; in a1 = char
HAL_DebugTX STMFD sp!,{a1,lr}
busy MOV a1, #0
BL HAL_UARTLineStatus
TST a1, #&20
BEQ busy
LDMFD sp!, {a2,lr}
MOV a1, #0
B HAL_UARTTransmitByte
HAL_DebugTX STMFD sp!,{a1,lr}
busy MOV a1, #0
BL HAL_UARTLineStatus
TST a1, #&20
BEQ busy
LDMFD sp!, {a2,lr}
MOV a1, #0
B HAL_UARTTransmitByte
; out a1 = char if there or -1
HAL_DebugRX stmfd sp!, {a2,lr}
......@@ -60,4 +60,4 @@ HAL_DebugRX stmfd sp!, {a2,lr}
mvneq a1, #0 ; -1 exit if no character
ldmfd sp!, {a2,pc}
END
END
This diff is collapsed.
......@@ -61,8 +61,8 @@ Interrupt_Init
HAL_IRQEnable
CMN a1,#1
MOVEQ pc,lr
CMN a1,#1
MOVEQ pc,lr
LDR ip, IRQ_Base_Address
ADD ip, ip, #IRQ_EN1
......@@ -76,8 +76,8 @@ HAL_IRQEnable
MOV pc, lr
HAL_IRQDisable
CMN a1,#1
MOVEQ pc,lr
CMN a1,#1
MOVEQ pc,lr
LDR ip, IRQ_Base_Address
ADD ip, ip, #IRQ_DIS1
......@@ -118,8 +118,8 @@ HAL_FIQStatus
; This interrupt controller does not allow us to see the status of the interrupt request
; lines prior to masking by the interrupt enable register, which is the defined result
; of this call. The closest we can do is checking whether the stated device is interrupting.
CMN a1,#1
MOVEQ pc,lr
CMN a1,#1
MOVEQ pc,lr
LDR ip, IRQ_Base_Address
ASSERT IRQ_PENDB = 0
......@@ -137,8 +137,8 @@ FIQEnable * 1<<7
FIQSourceMask * &7F
HAL_FIQEnable
CMN a1,#1
MOVEQ pc,lr
CMN a1,#1
MOVEQ pc,lr
LDR ip, IRQ_Base_Address
......@@ -156,11 +156,11 @@ HAL_FIQEnable
MOVEQ a1, #1
MOVNE a1, #0
MOV pc, lr
MOV pc, lr
HAL_FIQDisable
CMN a1,#1
MOVEQ pc,lr
CMN a1,#1
MOVEQ pc,lr
LDR ip, IRQ_Base_Address
......@@ -179,7 +179,7 @@ HAL_FIQDisable
MOVEQ a1, #1
MOVNE a1, #0
MOV pc, lr
MOV pc, lr
HAL_FIQDisableAll
LDR ip, IRQ_Base_Address
......@@ -194,14 +194,14 @@ HAL_FIQDisableAll
MOV a2, a2, LSL a3 ; bitmask
MOV a3, a1, LSR #5 ; shift to get relevant register
STR a2, [ip, a3, LSL #2] ; disable our bit
MOV pc, lr
MOV pc, lr
HAL_FIQSource
; There can only be one, the configured FIQ device
LDR ip, IRQ_Base_Address
LDR a1, [ip, #IRQ_FIQCTL]
AND a1, a1, #FIQSourceMask
MOV pc, lr
MOV pc, lr
END
......@@ -30,20 +30,20 @@
; its Linux drivers, thus making this port possible.
;
AREA |ARM$$code|, CODE, READONLY, PIC
AREA |ARM$$code|, CODE, READONLY, PIC
GET hdr.BCM2835
GET hdr.StaticWS
GET hdr.BCM2835
GET hdr.StaticWS
IMPORT cmos
IMPORT cmos
IMPORT workspace
IMPORT workspace
[ HALDebug
IMPORT output_hex8
IMPORT output_newline
IMPORT output_text
IMPORT output_text_at
IMPORT output_hex8
IMPORT output_newline
IMPORT output_text
IMPORT output_text_at
]
EXPORT HAL_IICBuses
......@@ -67,78 +67,78 @@
EXPORT HAL_KbdScanFinish
EXPORT HAL_KbdScanInterrupt
MACRO
HALStub $str
MACRO
HALStub $str
[ HALDebug
STMFD sp!,{a1,lr}
ADR a1,%FT01
ADR lr,%FT02
B output_text
01 = "$str called from "
ALIGN
02 LDR a1,[sp,#4]
BL output_hex8
BL output_newline
LDMFD sp!,{a1,lr}
STMFD sp!,{a1,lr}
ADR a1,%FT01
ADR lr,%FT02
B output_text
01 = "$str called from "
ALIGN
02 LDR a1,[sp,#4]
BL output_hex8
BL output_newline
LDMFD sp!,{a1,lr}
]
MEND
MEND
HAL_IICBuses
MOV a1,#0
MOV pc,lr
MOV a1,#0
MOV pc,lr
HAL_IICType
HALStub "HAL_IICType"
MOV pc,lr
HALStub "HAL_IICType"
MOV pc,lr
HAL_IICDevice
HALStub "HAL_IICDevice"
MOV pc,lr
HALStub "HAL_IICDevice"
MOV pc,lr
HAL_IICTransfer
HALStub "HAL_IICTransfer"
MOV pc,lr
HALStub "HAL_IICTransfer"
MOV pc,lr
HAL_IICMonitorTransfer
HALStub "HAL_IICMonitorTransfer"
MOV pc,lr
HALStub "HAL_IICMonitorTransfer"
MOV pc,lr
HAL_NVMemoryType
HALStub "HAL_NVMemoryType"
MOV a1,#0
MOV pc,lr
HALStub "HAL_NVMemoryType"
MOV a1,#0
MOV pc,lr
HAL_NVMemorySize
MOV a1,#2048
MOV pc,lr
MOV a1,#2048
MOV pc,lr
HAL_NVMemoryPageSize
MOV a1,#2048
MOV pc,lr
MOV a1,#2048
MOV pc,lr
HAL_NVMemoryProtectedSize
MOV a1,#0
MOV pc,lr
MOV a1,#0
MOV pc,lr
HAL_NVMemoryProtection
MOV a1,#0
MOV pc,lr
MOV a1,#0
MOV pc,lr
HAL_NVMemoryRead
ADRL ip,cmos
ADD ip,ip,a1
MOVS a1,a3
nvr_lp LDRNEB a4,[ip],#1
STRNEB a4,[a2],#1
SUBNES a3,a3,#1
BNE nvr_lp
MOV pc,lr
ADRL ip,cmos
ADD ip,ip,a1
MOVS a1,a3
nvr_lp LDRNEB a4,[ip],#1
STRNEB a4,[a2],#1
SUBNES a3,a3,#1
BNE nvr_lp
MOV pc,lr
HAL_NVMemoryWrite
; HALStub "HAL_NVMemoryWrite"
MOV a1,a3
MOV pc,lr
; HALStub "HAL_NVMemoryWrite"
MOV a1,a3
MOV pc,lr
HAL_UARTPorts
HALStub "HAL_UARTPorts"
MOV a1,#0
MOV pc,lr
HALStub "HAL_UARTPorts"
MOV a1,#0
MOV pc,lr
HAL_UARTStartUp
HAL_UARTShutdown
......@@ -158,31 +158,31 @@ HAL_UARTBreak
HAL_UARTModemControl
HAL_UARTModemStatus
HAL_UARTDevice
HALStub "HAL_UART<>"
MOV pc,lr
HALStub "HAL_UART<>"
MOV pc,lr
HAL_ATAControllerInfo
HALStub "HAL_ATAControllerInfo"
MOV pc,lr
HALStub "HAL_ATAControllerInfo"
MOV pc,lr
HAL_KbdScanSetup
HALStub "HAL_KbdScanSetup"
MOV pc,lr
HALStub "HAL_KbdScanSetup"
MOV pc,lr
HAL_KbdScan
HALStub "HAL_KbdScan"
MOV a1,#&80000000 ; signal keyboard scan complete
ORR a1,a1,#&00040 ; .. Del pressed
MOV pc,lr
HALStub "HAL_KbdScan"
MOV a1,#&80000000 ; signal keyboard scan complete
ORR a1,a1,#&00040 ; .. Del pressed
MOV pc,lr
HAL_KbdScanFinish
HALStub "Hal_KbdScanFinish"
MOV pc,lr
HALStub "Hal_KbdScanFinish"
MOV pc,lr
HAL_KbdScanInterrupt
HALStub "HAL_KbdScanInterrupt"
MOV pc,lr
HALStub "HAL_KbdScanInterrupt"
MOV pc,lr
END
END
This diff is collapsed.
;
; Copyright (c) 2012, RISC OS Open Ltd
; Copyright (c) 2012, RISC OS Open Ltd
; Copyright (c) 2012, Adrian Lees
; All rights reserved.
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions are met:
......@@ -44,13 +44,13 @@
GET Hdr:Proc
GET hdr.BCM2835
GET hdr.BCM2835
GET hdr.StaticWS
[ HALDebug
IMPORT output_hex8
IMPORT output_newline
IMPORT output_text
IMPORT output_hex8
IMPORT output_newline
IMPORT output_text
]
EXPORT HAL_UARTPorts
......@@ -73,21 +73,21 @@
EXPORT HAL_UARTModemStatus
EXPORT HAL_UARTDevice
MACRO
HALStub $str
MACRO
HALStub $str
[ HALDebug
STMFD sp!,{a1,lr}
ADR a1,%FT01
ADR lr,%FT02
B output_text
01 = "$str called from "
ALIGN
02 LDR a1,[sp,#4]