Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefer BCM2711 nomenclature over BCM2838 #683

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prefer BCM2711 nomenclature over BCM2838 #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion host_applications/linux/apps/hello_pi/hello_font/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ int main(void)
bcm_host_init();
int s;

if (get_processor_id() == PROCESSOR_BCM2838)
if (get_processor_id() == PROCESSOR_BCM2711)
{
puts("This demo application is not available on the Pi4\n\n");
exit(0);
Expand Down
2 changes: 1 addition & 1 deletion host_applications/linux/apps/hello_pi/hello_teapot/triangle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ int main ()
{
bcm_host_init();

if (get_processor_id() == PROCESSOR_BCM2838)
if (get_processor_id() == PROCESSOR_BCM2711)
{
puts("This demo application is not available on the Pi4\n\n");
exit(0);
Expand Down
2 changes: 1 addition & 1 deletion host_applications/linux/apps/hello_pi/hello_tiger/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ int main(void)
uint32_t width, height;
bcm_host_init();

if (get_processor_id() == PROCESSOR_BCM2838)
if (get_processor_id() == PROCESSOR_BCM2711)
{
puts("This demo application is not available on the Pi4\n\n");
exit(0);
Expand Down
2 changes: 1 addition & 1 deletion host_applications/linux/apps/hello_pi/hello_triangle/triangle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ int main ()
{
bcm_host_init();

if (get_processor_id() == PROCESSOR_BCM2838)
if (get_processor_id() == PROCESSOR_BCM2711)
{
puts("This demo application is not available on the Pi4\n\n");
exit(0);
Expand Down
2 changes: 1 addition & 1 deletion host_applications/linux/apps/hello_pi/hello_triangle2/triangle2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ int main ()
GLfloat cx, cy;
bcm_host_init();

if (get_processor_id() == PROCESSOR_BCM2838)
if (get_processor_id() == PROCESSOR_BCM2711)
{
puts("This demo application is not available on the Pi4\n\n");
exit(0);
Expand Down
2 changes: 1 addition & 1 deletion host_applications/linux/apps/hello_pi/hello_videocube/triangle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ int main ()
{
bcm_host_init();

if (get_processor_id() == PROCESSOR_BCM2838)
if (get_processor_id() == PROCESSOR_BCM2711)
{
puts("This demo application is not available on the Pi4\n\n");
exit(0);
Expand Down
3 changes: 2 additions & 1 deletion host_applications/linux/apps/hello_pi/libs/revision/revision.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define PROCESSOR_BCM2835 0
#define PROCESSOR_BCM2836 1
#define PROCESSOR_BCM2837 2
#define PROCESSOR_BCM2838 3
#define PROCESSOR_BCM2711 3
#define PROCESSOR_BCM2838 3 // included for backwards-compatibility

/* Returns the type of the Pi being used
*/
Expand Down
3 changes: 2 additions & 1 deletion host_applications/linux/libs/bcm_host/include/bcm_host.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ extern int bcm_host_is_kms_active(void);
#define BCM_HOST_PROCESSOR_BCM2835 0
#define BCM_HOST_PROCESSOR_BCM2836 1
#define BCM_HOST_PROCESSOR_BCM2837 2
#define BCM_HOST_PROCESSOR_BCM2838 3
#define BCM_HOST_PROCESSOR_BCM2711 3
#define BCM_HOST_PROCESSOR_BCM2838 3 // included for backwards-compatibility

extern int bcm_host_get_processor_id(void);

Expand Down