diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 10:10:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 10:10:52 -0700 |
commit | ceb198bb007b84ead867e87a71ffe715c4412b15 (patch) | |
tree | 2d933558cdef1f0e8e7f8efed8b1444a5558fa04 | |
parent | b68e7e952f24527de62f4768b1cead91f92f5f6e (diff) | |
parent | f6ab4d59a5fe205f12287e515a43fc5e6de779b1 (diff) | |
download | op-kernel-dev-ceb198bb007b84ead867e87a71ffe715c4412b15.zip op-kernel-dev-ceb198bb007b84ead867e87a71ffe715c4412b15.tar.gz |
Merge tag 'm68k-for-v4.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- more kernel message modernizations and cleanups
- Mac and Nubus improvements and cleanups.
* tag 'm68k-for-v4.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
nubus: Add MVC and VSC video card definitions
nubus: Clean up whitespace
nubus: Clean up printk calls
nubus: Fix nubus_rewinddir
m68k/mac: Clarify IOP message alloc/free confusion
m68k/mac: Adopt platform_device_register_simple()
m68k/mac: Modernize printing of kernel messages
m68k/mac: IOP - Modernize printing of kernel messages
-rw-r--r-- | arch/m68k/mac/config.c | 61 | ||||
-rw-r--r-- | arch/m68k/mac/iop.c | 93 | ||||
-rw-r--r-- | arch/m68k/mac/misc.c | 23 | ||||
-rw-r--r-- | drivers/nubus/nubus.c | 459 | ||||
-rw-r--r-- | include/uapi/linux/nubus.h | 4 |
5 files changed, 278 insertions, 362 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 9dc65a4..22123f7 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -150,7 +150,7 @@ static void mac_cache_card_flush(int writeback) void __init config_mac(void) { if (!MACH_IS_MAC) - printk(KERN_ERR "ERROR: no Mac, but config_mac() called!!\n"); + pr_err("ERROR: no Mac, but config_mac() called!!\n"); mach_sched_init = mac_sched_init; mach_init_IRQ = mac_init_IRQ; @@ -837,8 +837,7 @@ static void __init mac_identify(void) /* no bootinfo model id -> NetBSD booter was used! */ /* XXX FIXME: breaks for model > 31 */ model = (mac_bi_data.cpuid >> 2) & 63; - printk(KERN_WARNING "No bootinfo model ID, using cpuid instead " - "(obsolete bootloader?)\n"); + pr_warn("No bootinfo model ID, using cpuid instead (obsolete bootloader?)\n"); } macintosh_config = mac_data_table; @@ -880,14 +879,13 @@ static void __init mac_identify(void) */ iop_preinit(); - printk(KERN_INFO "Detected Macintosh model: %d\n", model); + pr_info("Detected Macintosh model: %d\n", model); /* * Report booter data: */ printk(KERN_DEBUG " Penguin bootinfo data:\n"); - printk(KERN_DEBUG " Video: addr 0x%lx " - "row 0x%lx depth %lx dimensions %ld x %ld\n", + printk(KERN_DEBUG " Video: addr 0x%lx row 0x%lx depth %lx dimensions %ld x %ld\n", mac_bi_data.videoaddr, mac_bi_data.videorow, mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF, mac_bi_data.dimensions >> 16); @@ -912,7 +910,7 @@ static void __init mac_identify(void) static void __init mac_report_hardware(void) { - printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name); + pr_info("Apple Macintosh %s\n", macintosh_config->name); } static void mac_get_model(char *str) @@ -921,15 +919,6 @@ static void mac_get_model(char *str) strcat(str, macintosh_config->name); } -static struct resource swim_rsrc = { .flags = IORESOURCE_MEM }; - -static struct platform_device swim_pdev = { - .name = "swim", - .id = -1, - .num_resources = 1, - .resource = &swim_rsrc, -}; - static const struct resource mac_scsi_iifx_rsrc[] __initconst = { { .flags = IORESOURCE_IRQ, @@ -994,26 +983,6 @@ static const struct resource mac_scsi_ccl_rsrc[] __initconst = { }, }; -static struct platform_device esp_0_pdev = { - .name = "mac_esp", - .id = 0, -}; - -static struct platform_device esp_1_pdev = { - .name = "mac_esp", - .id = 1, -}; - -static struct platform_device sonic_pdev = { - .name = "macsonic", - .id = -1, -}; - -static struct platform_device mace_pdev = { - .name = "macmace", - .id = -1, -}; - int __init mac_platform_init(void) { u8 *swim_base; @@ -1045,9 +1014,13 @@ int __init mac_platform_init(void) } if (swim_base) { - swim_rsrc.start = (resource_size_t) swim_base, - swim_rsrc.end = (resource_size_t) swim_base + 0x2000, - platform_device_register(&swim_pdev); + struct resource swim_rsrc = { + .flags = IORESOURCE_MEM, + .start = (resource_size_t)swim_base, + .end = (resource_size_t)swim_base + 0x2000, + }; + + platform_device_register_simple("swim", -1, &swim_rsrc, 1); } /* @@ -1057,13 +1030,13 @@ int __init mac_platform_init(void) switch (macintosh_config->scsi_type) { case MAC_SCSI_QUADRA: case MAC_SCSI_QUADRA3: - platform_device_register(&esp_0_pdev); + platform_device_register_simple("mac_esp", 0, NULL, 0); break; case MAC_SCSI_QUADRA2: - platform_device_register(&esp_0_pdev); + platform_device_register_simple("mac_esp", 0, NULL, 0); if ((macintosh_config->ident == MAC_MODEL_Q900) || (macintosh_config->ident == MAC_MODEL_Q950)) - platform_device_register(&esp_1_pdev); + platform_device_register_simple("mac_esp", 1, NULL, 0); break; case MAC_SCSI_IIFX: /* Addresses from The Guide to Mac Family Hardware. @@ -1129,10 +1102,10 @@ int __init mac_platform_init(void) switch (macintosh_config->ether_type) { case MAC_ETHER_SONIC: - platform_device_register(&sonic_pdev); + platform_device_register_simple("macsonic", -1, NULL, 0); break; case MAC_ETHER_MACE: - platform_device_register(&mace_pdev); + platform_device_register_simple("macmace", -1, NULL, 0); break; } diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c index 7990b6f..4c1e606 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c @@ -115,7 +115,17 @@ #include <asm/macints.h> #include <asm/mac_iop.h> -/*#define DEBUG_IOP*/ +#ifdef DEBUG +#define iop_pr_debug(fmt, ...) \ + printk(KERN_DEBUG "%s: " fmt, __func__, ##__VA_ARGS__) +#define iop_pr_cont(fmt, ...) \ + printk(KERN_CONT fmt, ##__VA_ARGS__) +#else +#define iop_pr_debug(fmt, ...) \ + no_printk(KERN_DEBUG "%s: " fmt, __func__, ##__VA_ARGS__) +#define iop_pr_cont(fmt, ...) \ + no_printk(KERN_CONT fmt, ##__VA_ARGS__) +#endif /* Non-zero if the IOPs are present */ @@ -200,7 +210,7 @@ static int iop_alive(volatile struct mac_iop *iop) return retval; } -static struct iop_msg *iop_alloc_msg(void) +static struct iop_msg *iop_get_unused_msg(void) { int i; unsigned long flags; @@ -219,11 +229,6 @@ static struct iop_msg *iop_alloc_msg(void) return NULL; } -static void iop_free_msg(struct iop_msg *msg) -{ - msg->status = IOP_MSGSTATUS_UNUSED; -} - /* * This is called by the startup code before anything else. Its purpose * is to find and initialize the IOPs early in the boot sequence, so that @@ -268,10 +273,10 @@ void __init iop_init(void) int i; if (iop_scc_present) { - printk("IOP: detected SCC IOP at %p\n", iop_base[IOP_NUM_SCC]); + pr_info("IOP: detected SCC IOP at %p\n", iop_base[IOP_NUM_SCC]); } if (iop_ism_present) { - printk("IOP: detected ISM IOP at %p\n", iop_base[IOP_NUM_ISM]); + pr_info("IOP: detected ISM IOP at %p\n", iop_base[IOP_NUM_ISM]); iop_start(iop_base[IOP_NUM_ISM]); iop_alive(iop_base[IOP_NUM_ISM]); /* clears the alive flag */ } @@ -310,9 +315,9 @@ void __init iop_register_interrupts(void) pr_err("Couldn't register ISM IOP interrupt\n"); } if (!iop_alive(iop_base[IOP_NUM_ISM])) { - printk("IOP: oh my god, they killed the ISM IOP!\n"); + pr_warn("IOP: oh my god, they killed the ISM IOP!\n"); } else { - printk("IOP: the ISM IOP seems to be alive.\n"); + pr_warn("IOP: the ISM IOP seems to be alive.\n"); } } } @@ -349,9 +354,8 @@ void iop_complete_message(struct iop_msg *msg) int chan = msg->channel; int i,offset; -#ifdef DEBUG_IOP - printk("iop_complete(%p): iop %d chan %d\n", msg, msg->iop_num, msg->channel); -#endif + iop_pr_debug("msg %p iop_num %d channel %d\n", msg, msg->iop_num, + msg->channel); offset = IOP_ADDR_RECV_MSG + (msg->channel * IOP_MSG_LEN); @@ -363,7 +367,7 @@ void iop_complete_message(struct iop_msg *msg) IOP_ADDR_RECV_STATE + chan, IOP_MSG_COMPLETE); iop_interrupt(iop_base[msg->iop_num]); - iop_free_msg(msg); + msg->status = IOP_MSGSTATUS_UNUSED; } /* @@ -394,12 +398,10 @@ static void iop_do_send(struct iop_msg *msg) static void iop_handle_send(uint iop_num, uint chan) { volatile struct mac_iop *iop = iop_base[iop_num]; - struct iop_msg *msg,*msg2; + struct iop_msg *msg; int i,offset; -#ifdef DEBUG_IOP - printk("iop_handle_send: iop %d channel %d\n", iop_num, chan); -#endif + iop_pr_debug("iop_num %d chan %d\n", iop_num, chan); iop_writeb(iop, IOP_ADDR_SEND_STATE + chan, IOP_MSG_IDLE); @@ -411,10 +413,8 @@ static void iop_handle_send(uint iop_num, uint chan) msg->reply[i] = iop_readb(iop, offset); } if (msg->handler) (*msg->handler)(msg); - msg2 = msg; + msg->status = IOP_MSGSTATUS_UNUSED; msg = msg->next; - iop_free_msg(msg2); - iop_send_queue[iop_num][chan] = msg; if (msg) iop_do_send(msg); } @@ -430,11 +430,9 @@ static void iop_handle_recv(uint iop_num, uint chan) int i,offset; struct iop_msg *msg; -#ifdef DEBUG_IOP - printk("iop_handle_recv: iop %d channel %d\n", iop_num, chan); -#endif + iop_pr_debug("iop_num %d chan %d\n", iop_num, chan); - msg = iop_alloc_msg(); + msg = iop_get_unused_msg(); msg->iop_num = iop_num; msg->channel = chan; msg->status = IOP_MSGSTATUS_UNSOL; @@ -454,14 +452,9 @@ static void iop_handle_recv(uint iop_num, uint chan) if (msg->handler) { (*msg->handler)(msg); } else { -#ifdef DEBUG_IOP - printk("iop_handle_recv: unclaimed message on iop %d channel %d\n", iop_num, chan); - printk("iop_handle_recv:"); - for (i = 0 ; i < IOP_MSG_LEN ; i++) { - printk(" %02X", (uint) msg->message[i]); - } - printk("\n"); -#endif + iop_pr_debug("unclaimed message on iop_num %d chan %d\n", + iop_num, chan); + iop_pr_debug("%*ph\n", IOP_MSG_LEN, msg->message); iop_complete_message(msg); } } @@ -484,7 +477,7 @@ int iop_send_message(uint iop_num, uint chan, void *privdata, if (chan >= NUM_IOP_CHAN) return -EINVAL; if (msg_len > IOP_MSG_LEN) return -EINVAL; - msg = iop_alloc_msg(); + msg = iop_get_unused_msg(); if (!msg) return -ENOMEM; msg->next = NULL; @@ -574,50 +567,34 @@ irqreturn_t iop_ism_irq(int irq, void *dev_id) volatile struct mac_iop *iop = iop_base[iop_num]; int i,state; -#ifdef DEBUG_IOP - printk("iop_ism_irq: status = %02X\n", (uint) iop->status_ctrl); -#endif + iop_pr_debug("status %02X\n", iop->status_ctrl); /* INT0 indicates a state change on an outgoing message channel */ if (iop->status_ctrl & IOP_INT0) { iop->status_ctrl = IOP_INT0 | IOP_RUN | IOP_AUTOINC; -#ifdef DEBUG_IOP - printk("iop_ism_irq: new status = %02X, send states", - (uint) iop->status_ctrl); -#endif + iop_pr_debug("new status %02X, send states", iop->status_ctrl); for (i = 0 ; i < NUM_IOP_CHAN ; i++) { state = iop_readb(iop, IOP_ADDR_SEND_STATE + i); -#ifdef DEBUG_IOP - printk(" %02X", state); -#endif + iop_pr_cont(" %02X", state); if (state == IOP_MSG_COMPLETE) { iop_handle_send(iop_num, i); } } -#ifdef DEBUG_IOP - printk("\n"); -#endif + iop_pr_cont("\n"); } if (iop->status_ctrl & IOP_INT1) { /* INT1 for incoming msgs */ iop->status_ctrl = IOP_INT1 | IOP_RUN | IOP_AUTOINC; -#ifdef DEBUG_IOP - printk("iop_ism_irq: new status = %02X, recv states", - (uint) iop->status_ctrl); -#endif + iop_pr_debug("new status %02X, recv states", iop->status_ctrl); for (i = 0 ; i < NUM_IOP_CHAN ; i++) { state = iop_readb(iop, IOP_ADDR_RECV_STATE + i); -#ifdef DEBUG_IOP - printk(" %02X", state); -#endif + iop_pr_cont(" %02X", state); if (state == IOP_MSG_NEW) { iop_handle_recv(iop_num, i); } } -#ifdef DEBUG_IOP - printk("\n"); -#endif + iop_pr_cont("\n"); } return IRQ_HANDLED; } diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 5b01704..8aa8792 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -281,8 +281,7 @@ static long via_read_time(void) last_result.idata = result.idata; } - pr_err("via_read_time: failed to read a stable value; " - "got 0x%08lx then 0x%08lx\n", + pr_err("via_read_time: failed to read a stable value; got 0x%08lx then 0x%08lx\n", last_result.idata, result.idata); return 0; @@ -465,7 +464,7 @@ void mac_poweroff(void) #endif } local_irq_enable(); - printk("It is now safe to turn off your Macintosh.\n"); + pr_crit("It is now safe to turn off your Macintosh.\n"); while(1); } @@ -556,7 +555,7 @@ void mac_reset(void) /* should never get here */ local_irq_enable(); - printk ("Restart failed. Please restart manually.\n"); + pr_crit("Restart failed. Please restart manually.\n"); while(1); } @@ -661,17 +660,13 @@ int mac_hwclk(int op, struct rtc_time *t) unmktime(now, 0, &t->tm_year, &t->tm_mon, &t->tm_mday, &t->tm_hour, &t->tm_min, &t->tm_sec); -#if 0 - printk("mac_hwclk: read %04d-%02d-%-2d %02d:%02d:%02d\n", - t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min, t->tm_sec); -#endif + pr_debug("%s: read %04d-%02d-%-2d %02d:%02d:%02d\n", + __func__, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min, t->tm_sec); } else { /* write */ -#if 0 - printk("mac_hwclk: tried to write %04d-%02d-%-2d %02d:%02d:%02d\n", - t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min, t->tm_sec); -#endif + pr_debug("%s: tried to write %04d-%02d-%-2d %02d:%02d:%02d\n", + __func__, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min, t->tm_sec); now = mktime(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec); diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c index 3319cf1..77a48a5 100644 --- a/drivers/nubus/nubus.c +++ b/drivers/nubus/nubus.c @@ -44,8 +44,8 @@ extern void oss_nubus_init(void); /* Globals */ -struct nubus_dev* nubus_devices; -struct nubus_board* nubus_boards; +struct nubus_dev *nubus_devices; +struct nubus_board *nubus_boards; /* Meaning of "bytelanes": @@ -69,26 +69,26 @@ struct nubus_board* nubus_boards; Etcetera, etcetera. Hopefully this clears up some confusion over what the following code actually does. */ - + static inline int not_useful(void *p, int map) { - unsigned long pv=(unsigned long)p; + unsigned long pv = (unsigned long)p; + pv &= 3; - if(map & (1<<pv)) + if (map & (1 << pv)) return 0; return 1; } - + static unsigned long nubus_get_rom(unsigned char **ptr, int len, int map) { /* This will hold the result */ unsigned long v = 0; unsigned char *p = *ptr; - while(len) - { + while (len) { v <<= 8; - while(not_useful(p,map)) + while (not_useful(p, map)) p++; v |= *p++; len--; @@ -99,31 +99,28 @@ static unsigned long nubus_get_rom(unsigned char **ptr, int len, int map) static void nubus_rewind(unsigned char **ptr, int len, int map) { - unsigned char *p=*ptr; + unsigned char *p = *ptr; /* Sanity check */ - if(len > 65536) - printk(KERN_ERR "rewind of 0x%08x!\n", len); - while(len) - { - do - { + if (len > 65536) + pr_err("rewind of 0x%08x!\n", len); + while (len) { + do { p--; - } - while(not_useful(p, map)); + } while (not_useful(p, map)); len--; } - *ptr=p; + *ptr = p; } static void nubus_advance(unsigned char **ptr, int len, int map) { unsigned char *p = *ptr; - if(len>65536) - printk(KERN_ERR "advance of 0x%08x!\n", len); - while(len) - { - while(not_useful(p,map)) + + if (len > 65536) + pr_err("advance of 0x%08x!\n", len); + while (len) { + while (not_useful(p, map)) p++; p++; len--; @@ -133,9 +130,9 @@ static void nubus_advance(unsigned char **ptr, int len, int map) static void nubus_move(unsigned char **ptr, int len, int map) { - if(len > 0) + if (len > 0) nubus_advance(ptr, len, map); - else if(len < 0) + else if (len < 0) nubus_rewind(ptr, -len, map); } @@ -148,23 +145,24 @@ static void nubus_move(unsigned char **ptr, int len, int map) static inline long nubus_expand32(long foo) { - if(foo & 0x00800000) /* 24bit negative */ + if (foo & 0x00800000) /* 24bit negative */ foo |= 0xFF000000; return foo; } static inline void *nubus_rom_addr(int slot) -{ +{ /* * Returns the first byte after the card. We then walk * backwards to get the lane register and the config */ - return (void *)(0xF1000000+(slot<<24)); + return (void *)(0xF1000000 + (slot << 24)); } static unsigned char *nubus_dirptr(const struct nubus_dirent *nd) { unsigned char *p = nd->base; + /* Essentially, just step over the bytelanes using whatever offset we might have found */ nubus_move(&p, nubus_expand32(nd->data), nd->mask); @@ -175,36 +173,36 @@ static unsigned char *nubus_dirptr(const struct nubus_dirent *nd) /* These two are for pulling resource data blocks (i.e. stuff that's pointed to with offsets) out of the card ROM. */ -void nubus_get_rsrc_mem(void *dest, const struct nubus_dirent* dirent, +void nubus_get_rsrc_mem(void *dest, const struct nubus_dirent *dirent, int len) { unsigned char *t = (unsigned char *)dest; unsigned char *p = nubus_dirptr(dirent); - while(len) - { + + while (len) { *t++ = nubus_get_rom(&p, 1, dirent->mask); len--; } } EXPORT_SYMBOL(nubus_get_rsrc_mem); -void nubus_get_rsrc_str(void *dest, const struct nubus_dirent* dirent, +void nubus_get_rsrc_str(void *dest, const struct nubus_dirent *dirent, int len) { - unsigned char *t=(unsigned char *)dest; + unsigned char *t = (unsigned char *)dest; unsigned char *p = nubus_dirptr(dirent); - while(len) - { + + while (len) { *t = nubus_get_rom(&p, 1, dirent->mask); - if(!*t++) + if (!*t++) break; len--; } } EXPORT_SYMBOL(nubus_get_rsrc_str); -int nubus_get_root_dir(const struct nubus_board* board, - struct nubus_dir* dir) +int nubus_get_root_dir(const struct nubus_board *board, + struct nubus_dir *dir) { dir->ptr = dir->base = board->directory; dir->done = 0; @@ -214,8 +212,8 @@ int nubus_get_root_dir(const struct nubus_board* board, EXPORT_SYMBOL(nubus_get_root_dir); /* This is a slyly renamed version of the above */ -int nubus_get_func_dir(const struct nubus_dev* dev, - struct nubus_dir* dir) +int nubus_get_func_dir(const struct nubus_dev *dev, + struct nubus_dir *dir) { dir->ptr = dir->base = dev->directory; dir->done = 0; @@ -224,11 +222,11 @@ int nubus_get_func_dir(const struct nubus_dev* dev, } EXPORT_SYMBOL(nubus_get_func_dir); -int nubus_get_board_dir(const struct nubus_board* board, - struct nubus_dir* dir) +int nubus_get_board_dir(const struct nubus_board *board, + struct nubus_dir *dir) { struct nubus_dirent ent; - + dir->ptr = dir->base = board->directory; dir->done = 0; dir->mask = board->lanes; @@ -256,6 +254,7 @@ EXPORT_SYMBOL(nubus_get_subdir); int nubus_readdir(struct nubus_dir *nd, struct nubus_dirent *ent) { u32 resid; + if (nd->done) return -1; @@ -266,25 +265,25 @@ int nubus_readdir(struct nubus_dir *nd, struct nubus_dirent *ent) resid = nubus_get_rom(&nd->ptr, 4, nd->mask); /* EOL marker, as per the Apple docs */ - if((resid&0xff000000) == 0xff000000) - { + if ((resid & 0xff000000) == 0xff000000) { /* Mark it as done */ nd->done = 1; return -1; } /* First byte is the resource ID */ - ent->type = resid >> 24; + ent->type = resid >> 24; /* Low 3 bytes might contain data (or might not) */ ent->data = resid & 0xffffff; - ent->mask = nd->mask; + ent->mask = nd->mask; return 0; } EXPORT_SYMBOL(nubus_readdir); -int nubus_rewinddir(struct nubus_dir* dir) +int nubus_rewinddir(struct nubus_dir *dir) { dir->ptr = dir->base; + dir->done = 0; return 0; } EXPORT_SYMBOL(nubus_rewinddir); @@ -292,20 +291,15 @@ EXPORT_SYMBOL(nubus_rewinddir); /* Driver interface functions, more or less like in pci.c */ struct nubus_dev* -nubus_find_device(unsigned short category, - unsigned short type, - unsigned short dr_hw, - unsigned short dr_sw, - const struct nubus_dev* from) +nubus_find_device(unsigned short category, unsigned short type, + unsigned short dr_hw, unsigned short dr_sw, + const struct nubus_dev *from) { - struct nubus_dev* itor = - from ? from->next : nubus_devices; + struct nubus_dev *itor = from ? from->next : nubus_devices; while (itor) { - if (itor->category == category - && itor->type == type - && itor->dr_hw == dr_hw - && itor->dr_sw == dr_sw) + if (itor->category == category && itor->type == type && + itor->dr_hw == dr_hw && itor->dr_sw == dr_sw) return itor; itor = itor->next; } @@ -314,16 +308,13 @@ nubus_find_device(unsigned short category, EXPORT_SYMBOL(nubus_find_device); struct nubus_dev* -nubus_find_type(unsigned short category, - unsigned short type, - const struct nubus_dev* from) +nubus_find_type(unsigned short category, unsigned short type, + const struct nubus_dev *from) { - struct nubus_dev* itor = - from ? from->next : nubus_devices; + struct nubus_dev *itor = from ? from->next : nubus_devices; while (itor) { - if (itor->category == category - && itor->type == type) + if (itor->category == category && itor->type == type) return itor; itor = itor->next; } @@ -332,12 +323,10 @@ nubus_find_type(unsigned short category, EXPORT_SYMBOL(nubus_find_type); struct nubus_dev* -nubus_find_slot(unsigned int slot, - const struct nubus_dev* from) +nubus_find_slot(unsigned int slot, const struct nubus_dev *from) { - struct nubus_dev* itor = - from ? from->next : nubus_devices; - + struct nubus_dev *itor = from ? from->next : nubus_devices; + while (itor) { if (itor->board->slot == slot) return itor; @@ -348,13 +337,13 @@ nubus_find_slot(unsigned int slot, EXPORT_SYMBOL(nubus_find_slot); int -nubus_find_rsrc(struct nubus_dir* dir, unsigned char rsrc_type, - struct nubus_dirent* ent) +nubus_find_rsrc(struct nubus_dir *dir, unsigned char rsrc_type, + struct nubus_dirent *ent) { while (nubus_readdir(dir, ent) != -1) { if (ent->type == rsrc_type) return 0; - } + } return -1; } EXPORT_SYMBOL(nubus_find_rsrc); @@ -368,77 +357,74 @@ EXPORT_SYMBOL(nubus_find_rsrc); among other things. The rest of it should go in the /proc code. For now, we just use it to give verbose boot logs. */ -static int __init nubus_show_display_resource(struct nubus_dev* dev, - const struct nubus_dirent* ent) +static int __init nubus_show_display_resource(struct nubus_dev *dev, + const struct nubus_dirent *ent) { switch (ent->type) { case NUBUS_RESID_GAMMADIR: - printk(KERN_INFO " gamma directory offset: 0x%06x\n", ent->data); + pr_info(" gamma directory offset: 0x%06x\n", ent->data); break; case 0x0080 ... 0x0085: - printk(KERN_INFO " mode %02X info offset: 0x%06x\n", + pr_info(" mode %02X info offset: 0x%06x\n", ent->type, ent->data); break; default: - printk(KERN_INFO " unknown resource %02X, data 0x%06x\n", + pr_info(" unknown resource %02X, data 0x%06x\n", ent->type, ent->data); } return 0; } -static int __init nubus_show_network_resource(struct nubus_dev* dev, - const struct nubus_dirent* ent) +static int __init nubus_show_network_resource(struct nubus_dev *dev, + const struct nubus_dirent *ent) { switch (ent->type) { case NUBUS_RESID_MAC_ADDRESS: { char addr[6]; - int i; - + nubus_get_rsrc_mem(addr, ent, 6); - printk(KERN_INFO " MAC address: "); - for (i = 0; i < 6; i++) - printk("%02x%s", addr[i] & 0xff, - i == 5 ? "" : ":"); - printk("\n"); + pr_info(" MAC address: %pM\n", addr); break; } default: - printk(KERN_INFO " unknown resource %02X, data 0x%06x\n", + pr_info(" unknown resource %02X, data 0x%06x\n", ent->type, ent->data); } return 0; } -static int __init nubus_show_cpu_resource(struct nubus_dev* dev, - const struct nubus_dirent* ent) +static int __init nubus_show_cpu_resource(struct nubus_dev *dev, + const struct nubus_dirent *ent) { switch (ent->type) { case NUBUS_RESID_MEMINFO: { unsigned long meminfo[2]; + nubus_get_rsrc_mem(&meminfo, ent, 8); - printk(KERN_INFO " memory: [ 0x%08lx 0x%08lx ]\n", + pr_info(" memory: [ 0x%08lx 0x%08lx ]\n", meminfo[0], meminfo[1]); break; } case NUBUS_RESID_ROMINFO: { unsigned long rominfo[2]; + nubus_get_rsrc_mem(&rominfo, ent, 8); - printk(KERN_INFO " ROM: [ 0x%08lx 0x%08lx ]\n", + pr_info(" ROM: [ 0x%08lx 0x%08lx ]\n", rominfo[0], rominfo[1]); break; } default: - printk(KERN_INFO " unknown resource %02X, data 0x%06x\n", + pr_info(" unknown resource %02X, data 0x%06x\n", ent->type, ent->data); } return 0; } -static int __init nubus_show_private_resource(struct nubus_dev* dev, - const struct nubus_dirent* ent) +static int __init nubus_show_private_resource(struct nubus_dev *dev, + const struct nubus_dirent *ent) { switch (dev->category) { case NUBUS_CAT_DISPLAY: @@ -451,59 +437,56 @@ static int __init nubus_show_private_resource(struct nubus_dev* dev, nubus_show_cpu_resource(dev, ent); break; default: - printk(KERN_INFO " unknown resource %02X, data 0x%06x\n", + pr_info(" unknown resource %02X, data 0x%06x\n", ent->type, ent->data); } return 0; } -static struct nubus_dev* __init - nubus_get_functional_resource(struct nubus_board* board, - int slot, - const struct nubus_dirent* parent) +static struct nubus_dev * __init +nubus_get_functional_resource(struct nubus_board *board, int slot, + const struct nubus_dirent *parent) { - struct nubus_dir dir; + struct nubus_dir dir; struct nubus_dirent ent; - struct nubus_dev* dev; - - printk(KERN_INFO " Function 0x%02x:\n", parent->type); + struct nubus_dev *dev; + + pr_info(" Function 0x%02x:\n", parent->type); nubus_get_subdir(parent, &dir); /* Apple seems to have botched the ROM on the IIx */ if (slot == 0 && (unsigned long)dir.base % 2) dir.base += 1; - - if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) - printk(KERN_DEBUG "nubus_get_functional_resource: parent is 0x%p, dir is 0x%p\n", - parent->base, dir.base); + + pr_debug("%s: parent is 0x%p, dir is 0x%p\n", + __func__, parent->base, dir.base); /* Actually we should probably panic if this fails */ if ((dev = kzalloc(sizeof(*dev), GFP_ATOMIC)) == NULL) - return NULL; + return NULL; dev->resid = parent->type; dev->directory = dir.base; dev->board = board; - - while (nubus_readdir(&dir, &ent) != -1) - { - switch(ent.type) - { + + while (nubus_readdir(&dir, &ent) != -1) { + switch (ent.type) { case NUBUS_RESID_TYPE: { unsigned short nbtdata[4]; + nubus_get_rsrc_mem(nbtdata, &ent, 8); dev->category = nbtdata[0]; dev->type = nbtdata[1]; dev->dr_sw = nbtdata[2]; dev->dr_hw = nbtdata[3]; - printk(KERN_INFO " type: [cat 0x%x type 0x%x hw 0x%x sw 0x%x]\n", - nbtdata[0], nbtdata[1], nbtdata[2], nbtdata[3]); + pr_info(" type: [cat 0x%x type 0x%x sw 0x%x hw 0x%x]\n", + nbtdata[0], nbtdata[1], nbtdata[2], nbtdata[3]); break; } case NUBUS_RESID_NAME: { nubus_get_rsrc_str(dev->name, &ent, 64); - printk(KERN_INFO " name: %s\n", dev->name); + pr_info(" name: %s\n", dev->name); break; } case NUBUS_RESID_DRVRDIR: @@ -512,11 +495,11 @@ static struct nubus_dev* __init use this :-) */ struct nubus_dir drvr_dir; struct nubus_dirent drvr_ent; + nubus_get_subdir(&ent, &drvr_dir); nubus_readdir(&drvr_dir, &drvr_ent); dev->driver = nubus_dirptr(&drvr_ent); - printk(KERN_INFO " driver at: 0x%p\n", - dev->driver); + pr_info(" driver at: 0x%p\n", dev->driver); break; } case NUBUS_RESID_MINOR_BASEOS: @@ -524,22 +507,20 @@ static struct nubus_dev* __init multiple framebuffers. It might be handy for Ethernet as well */ nubus_get_rsrc_mem(&dev->iobase, &ent, 4); - printk(KERN_INFO " memory offset: 0x%08lx\n", - dev->iobase); + pr_info(" memory offset: 0x%08lx\n", dev->iobase); break; case NUBUS_RESID_MINOR_LENGTH: /* Ditto */ nubus_get_rsrc_mem(&dev->iosize, &ent, 4); - printk(KERN_INFO " memory length: 0x%08lx\n", - dev->iosize); - break; + pr_info(" memory length: 0x%08lx\n", dev->iosize); + break; case NUBUS_RESID_FLAGS: dev->flags = ent.data; - printk(KERN_INFO " flags: 0x%06x\n", dev->flags); + pr_info(" flags: 0x%06x\n", dev->flags); break; case NUBUS_RESID_HWDEVID: dev->hwdevid = ent.data; - printk(KERN_INFO " hwdevid: 0x%06x\n", dev->hwdevid); + pr_info(" hwdevid: 0x%06x\n", dev->hwdevid); break; default: /* Local/Private resources have their own @@ -547,16 +528,17 @@ static struct nubus_dev* __init nubus_show_private_resource(dev, &ent); } } - + return dev; } /* This is cool. */ -static int __init nubus_get_vidnames(struct nubus_board* board, - const struct nubus_dirent* parent) +static int __init nubus_get_vidnames(struct nubus_board *board, + const struct nubus_dirent *parent) { - struct nubus_dir dir; + struct nubus_dir dir; struct nubus_dirent ent; + /* FIXME: obviously we want to put this in a header file soon */ struct vidmode { u32 size; @@ -566,100 +548,92 @@ static int __init nubus_get_vidnames(struct nubus_board* board, char name[32]; }; - printk(KERN_INFO " video modes supported:\n"); + pr_info(" video modes supported:\n"); nubus_get_subdir(parent, &dir); - if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) - printk(KERN_DEBUG "nubus_get_vidnames: parent is 0x%p, dir is 0x%p\n", - parent->base, dir.base); + pr_debug("%s: parent is 0x%p, dir is 0x%p\n", + __func__, parent->base, dir.base); - while(nubus_readdir(&dir, &ent) != -1) - { + while (nubus_readdir(&dir, &ent) != -1) { struct vidmode mode; u32 size; /* First get the length */ nubus_get_rsrc_mem(&size, &ent, 4); - + /* Now clobber the whole thing */ if (size > sizeof(mode) - 1) size = sizeof(mode) - 1; memset(&mode, 0, sizeof(mode)); nubus_get_rsrc_mem(&mode, &ent, size); - printk (KERN_INFO " %02X: (%02X) %s\n", ent.type, + pr_info(" %02X: (%02X) %s\n", ent.type, mode.id, mode.name); } return 0; } /* This is *really* cool. */ -static int __init nubus_get_icon(struct nubus_board* board, - const struct nubus_dirent* ent) +static int __init nubus_get_icon(struct nubus_board *board, + const struct nubus_dirent *ent) { /* Should be 32x32 if my memory serves me correctly */ unsigned char icon[128]; int x, y; - + nubus_get_rsrc_mem(&icon, ent, 128); - printk(KERN_INFO " icon:\n"); + pr_info(" icon:\n"); /* We should actually plot these somewhere in the framebuffer init. This is just to demonstrate that they do, in fact, exist */ for (y = 0; y < 32; y++) { - printk(KERN_INFO " "); + pr_info(" "); for (x = 0; x < 32; x++) { - if (icon[y*4 + x/8] - & (0x80 >> (x%8))) - printk("*"); + if (icon[y * 4 + x / 8] & (0x80 >> (x % 8))) + pr_cont("*"); else - printk(" "); + pr_cont(" "); } - printk("\n"); + pr_cont("\n"); } return 0; } -static int __init nubus_get_vendorinfo(struct nubus_board* board, - const struct nubus_dirent* parent) +static int __init nubus_get_vendorinfo(struct nubus_board *board, + const struct nubus_dirent *parent) { - struct nubus_dir dir; + struct nubus_dir dir; struct nubus_dirent ent; - static char* vendor_fields[6] = {"ID", "serial", "revision", - "part", "date", "unknown field"}; + static char *vendor_fields[6] = { "ID", "serial", "revision", + "part", "date", "unknown field" }; - printk(KERN_INFO " vendor info:\n"); + pr_info(" vendor info:\n"); nubus_get_subdir(parent, &dir); - if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) - printk(KERN_DEBUG "nubus_get_vendorinfo: parent is 0x%p, dir is 0x%p\n", - parent->base, dir.base); + pr_debug("%s: parent is 0x%p, dir is 0x%p\n", + __func__, parent->base, dir.base); - while(nubus_readdir(&dir, &ent) != -1) - { + while (nubus_readdir(&dir, &ent) != -1) { char name[64]; - + /* These are all strings, we think */ nubus_get_rsrc_str(name, &ent, 64); if (ent.type > 5) ent.type = 5; - printk(KERN_INFO " %s: %s\n", - vendor_fields[ent.type-1], name); + pr_info(" %s: %s\n", vendor_fields[ent.type - 1], name); } return 0; } -static int __init nubus_get_board_resource(struct nubus_board* board, int slot, - const struct nubus_dirent* parent) +static int __init nubus_get_board_resource(struct nubus_board *board, int slot, + const struct nubus_dirent *parent) { - struct nubus_dir dir; + struct nubus_dir dir; struct nubus_dirent ent; - + nubus_get_subdir(parent, &dir); - if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) - printk(KERN_DEBUG "nubus_get_board_resource: parent is 0x%p, dir is 0x%p\n", - parent->base, dir.base); + pr_debug("%s: parent is 0x%p, dir is 0x%p\n", + __func__, parent->base, dir.base); - while(nubus_readdir(&dir, &ent) != -1) - { + while (nubus_readdir(&dir, &ent) != -1) { switch (ent.type) { case NUBUS_RESID_TYPE: { @@ -668,50 +642,49 @@ static int __init nubus_get_board_resource(struct nubus_board* board, int slot, useful except insofar as it tells us that we really are looking at a board resource. */ nubus_get_rsrc_mem(nbtdata, &ent, 8); - printk(KERN_INFO " type: [cat 0x%x type 0x%x hw 0x%x sw 0x%x]\n", - nbtdata[0], nbtdata[1], nbtdata[2], - nbtdata[3]); + pr_info(" type: [cat 0x%x type 0x%x sw 0x%x hw 0x%x]\n", + nbtdata[0], nbtdata[1], nbtdata[2], nbtdata[3]); if (nbtdata[0] != 1 || nbtdata[1] != 0 || nbtdata[2] != 0 || nbtdata[3] != 0) - printk(KERN_ERR "this sResource is not a board resource!\n"); + pr_err("this sResource is not a board resource!\n"); break; } case NUBUS_RESID_NAME: nubus_get_rsrc_str(board->name, &ent, 64); - printk(KERN_INFO " name: %s\n", board->name); + pr_info(" name: %s\n", board->name); break; case NUBUS_RESID_ICON: nubus_get_icon(board, &ent); break; case NUBUS_RESID_BOARDID: - printk(KERN_INFO " board id: 0x%x\n", ent.data); + pr_info(" board id: 0x%x\n", ent.data); break; case NUBUS_RESID_PRIMARYINIT: - printk(KERN_INFO " primary init offset: 0x%06x\n", ent.data); + pr_info(" primary init offset: 0x%06x\n", ent.data); break; case NUBUS_RESID_VENDORINFO: nubus_get_vendorinfo(board, &ent); break; case NUBUS_RESID_FLAGS: - printk(KERN_INFO " flags: 0x%06x\n", ent.data); + pr_info(" flags: 0x%06x\n", ent.data); break; case NUBUS_RESID_HWDEVID: - printk(KERN_INFO " hwdevid: 0x%06x\n", ent.data); + pr_info(" hwdevid: 0x%06x\n", ent.data); break; case NUBUS_RESID_SECONDINIT: - printk(KERN_INFO " secondary init offset: 0x%06x\n", ent.data); + pr_info(" secondary init offset: 0x%06x\n", ent.data); break; - /* WTF isn't this in the functional resources? */ + /* WTF isn't this in the functional resources? */ case NUBUS_RESID_VIDNAMES: nubus_get_vidnames(board, &ent); break; /* Same goes for this */ case NUBUS_RESID_VIDMODES: - printk(KERN_INFO " video mode parameter directory offset: 0x%06x\n", + pr_info(" video mode parameter directory offset: 0x%06x\n", ent.data); - break; + break; default: - printk(KERN_INFO " unknown resource %02X, data 0x%06x\n", + pr_info(" unknown resource %02X, data 0x%06x\n", ent.type, ent.data); } } @@ -722,8 +695,8 @@ static int __init nubus_get_board_resource(struct nubus_board* board, int slot, sResources in the motherboard ROM */ static void __init nubus_find_rom_dir(struct nubus_board* board) { - unsigned char* rp; - unsigned char* romdir; + unsigned char *rp; + unsigned char *romdir; struct nubus_dir dir; struct nubus_dirent ent; @@ -756,14 +729,14 @@ static void __init nubus_find_rom_dir(struct nubus_board* board) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) printk(KERN_INFO "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data); /* This one takes us to where we want to go. */ - if (nubus_readdir(&dir, &ent) == -1) + if (nubus_readdir(&dir, &ent) == -1) goto badrom; if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data); nubus_get_subdir(&ent, &dir); /* Resource ID 01, also an "Unknown Macintosh" */ - if (nubus_readdir(&dir, &ent) == -1) + if (nubus_readdir(&dir, &ent) == -1) goto badrom; if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data); @@ -782,12 +755,12 @@ static void __init nubus_find_rom_dir(struct nubus_board* board) goto badrom; if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data); - + /* Bwahahahaha... */ nubus_get_subdir(&ent, &dir); board->directory = dir.base; return; - + /* Even more evil laughter... */ badrom: board->directory = board->fblock; @@ -796,43 +769,38 @@ static void __init nubus_find_rom_dir(struct nubus_board* board) } /* Add a board (might be many devices) to the list */ -static struct nubus_board* __init nubus_add_board(int slot, int bytelanes) +static struct nubus_board * __init nubus_add_board(int slot, int bytelanes) { - struct nubus_board* board; - struct nubus_board** boardp; - + struct nubus_board *board; + struct nubus_board **boardp; unsigned char *rp; unsigned long dpat; struct nubus_dir dir; struct nubus_dirent ent; /* Move to the start of the format block */ - rp = nubus_rom_addr(slot); + rp = nubus_rom_addr(slot); nubus_rewind(&rp, FORMAT_BLOCK_SIZE, bytelanes); /* Actually we should probably panic if this fails */ if ((board = kzalloc(sizeof(*board), GFP_ATOMIC)) == NULL) - return NULL; + return NULL; board->fblock = rp; /* Dump the format block for debugging purposes */ - if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) { - int i; - printk(KERN_DEBUG "Slot %X, format block at 0x%p\n", - slot, rp); - printk(KERN_DEBUG "Format block: "); - for (i = 0; i < FORMAT_BLOCK_SIZE; i += 4) { - unsigned short foo, bar; - foo = nubus_get_rom(&rp, 2, bytelanes); - bar = nubus_get_rom(&rp, 2, bytelanes); - printk("%04x %04x ", foo, bar); - } - printk("\n"); - rp = board->fblock; - } - + pr_debug("Slot %X, format block at 0x%p:\n", slot, rp); + pr_debug("%02lx\n", nubus_get_rom(&rp, 1, bytelanes)); + pr_debug("%02lx\n", nubus_get_rom(&rp, 1, bytelanes)); + pr_debug("%08lx\n", nubus_get_rom(&rp, 4, bytelanes)); + pr_debug("%02lx\n", nubus_get_rom(&rp, 1, bytelanes)); + pr_debug("%02lx\n", nubus_get_rom(&rp, 1, bytelanes)); + pr_debug("%08lx\n", nubus_get_rom(&rp, 4, bytelanes)); + pr_debug("%08lx\n", nubus_get_rom(&rp, 4, bytelanes)); + pr_debug("%08lx\n", nubus_get_rom(&rp, 4, bytelanes)); + rp = board->fblock; + board->slot = slot; - board->slot_addr = (unsigned long) nubus_slot_addr(slot); + board->slot_addr = (unsigned long)nubus_slot_addr(slot); board->doffset = nubus_get_rom(&rp, 4, bytelanes); /* rom_length is *supposed* to be the total length of the * ROM. In practice it is the "amount of ROM used to compute @@ -843,16 +811,16 @@ static struct nubus_board* __init nubus_add_board(int slot, int bytelanes) board->rom_length = nubus_get_rom(&rp, 4, bytelanes); board->crc = nubus_get_rom(&rp, 4, bytelanes); board->rev = nubus_get_rom(&rp, 1, bytelanes); - board->format = nubus_get_rom(&rp,1, bytelanes); + board->format = nubus_get_rom(&rp, 1, bytelanes); board->lanes = bytelanes; /* Directory offset should be small and negative... */ - if(!(board->doffset & 0x00FF0000)) - printk(KERN_WARNING "Dodgy doffset!\n"); + if (!(board->doffset & 0x00FF0000)) + pr_warn("Dodgy doffset!\n"); dpat = nubus_get_rom(&rp, 4, bytelanes); - if(dpat != NUBUS_TEST_PATTERN) - printk(KERN_WARNING "Wrong test pattern %08lx!\n", dpat); - + if (dpat != NUBUS_TEST_PATTERN) + pr_warn("Wrong test pattern %08lx!\n", dpat); + /* * I wonder how the CRC is meant to work - * any takers ? @@ -862,10 +830,10 @@ static struct nubus_board* __init nubus_add_board(int slot, int bytelanes) /* Attempt to work around slot zero weirdness */ nubus_find_rom_dir(board); - nubus_get_root_dir(board, &dir); + nubus_get_root_dir(board, &dir); /* We're ready to rock */ - printk(KERN_INFO "Slot %X:\n", slot); + pr_info("Slot %X:\n", slot); /* Each slot should have one board resource and any number of functional resources. So we'll fill in some fields in the @@ -874,10 +842,10 @@ static struct nubus_board* __init nubus_add_board(int slot, int bytelanes) for each of them. */ if (nubus_readdir(&dir, &ent) == -1) { /* We can't have this! */ - printk(KERN_ERR "Board resource not found!\n"); + pr_err("Board resource not found!\n"); return NULL; } else { - printk(KERN_INFO " Board resource:\n"); + pr_info(" Board resource:\n"); nubus_get_board_resource(board, slot, &ent); } @@ -885,8 +853,9 @@ static struct nubus_board* __init nubus_add_board(int slot, int bytelanes) resources. I have no idea WTF to do about this. */ while (nubus_readdir(&dir, &ent) != -1) { - struct nubus_dev* dev; - struct nubus_dev** devp; + struct nubus_dev *dev; + struct nubus_dev **devp; + dev = nubus_get_functional_resource(board, slot, &ent); if (dev == NULL) continue; @@ -894,32 +863,33 @@ static struct nubus_board* __init nubus_add_board(int slot, int bytelanes) /* We zeroed this out above */ if (board->first_dev == NULL) board->first_dev = dev; - + /* Put it on the global NuBus device chain. Keep entries in order. */ - for (devp=&nubus_devices; *devp!=NULL; devp=&((*devp)->next)) + for (devp = &nubus_devices; *devp != NULL; + devp = &((*devp)->next)) /* spin */; *devp = dev; - dev->next = NULL; + dev->next = NULL; } /* Put it on the global NuBus board chain. Keep entries in order. */ - for (boardp=&nubus_boards; *boardp!=NULL; boardp=&((*boardp)->next)) + for (boardp = &nubus_boards; *boardp != NULL; + boardp = &((*boardp)->next)) /* spin */; *boardp = board; board->next = NULL; - + return board; } void __init nubus_probe_slot(int slot) { unsigned char dp; - unsigned char* rp; + unsigned char *rp; int i; - rp = nubus_rom_addr(slot); - for(i = 4; i; i--) - { + rp = nubus_rom_addr(slot); + for (i = 4; i; i--) { int card_present; rp--; @@ -927,7 +897,6 @@ void __init nubus_probe_slot(int slot) if (!card_present) continue; - printk(KERN_DEBUG "Now probing slot %X at %p\n", slot, rp); dp = *rp; if(dp == 0) continue; @@ -935,11 +904,11 @@ void __init nubus_probe_slot(int slot) /* The last byte of the format block consists of two nybbles which are "mirror images" of each other. These show us the valid bytelanes */ - if ((((dp>>4) ^ dp) & 0x0F) != 0x0F) + if ((((dp >> 4) ^ dp) & 0x0F) != 0x0F) continue; /* Check that this value is actually *on* one of the bytelanes it claims are valid! */ - if ((dp & 0x0F) >= (1<<i)) + if ((dp & 0x0F) >= (1 << i)) continue; /* Looks promising. Let's put it on the list. */ @@ -952,19 +921,19 @@ void __init nubus_probe_slot(int slot) void __init nubus_scan_bus(void) { int slot; + /* This might not work on your machine */ #ifdef I_WANT_TO_PROBE_SLOT_ZERO nubus_probe_slot(0); #endif - for(slot = 9; slot < 15; slot++) - { + for (slot = 9; slot < 15; slot++) { nubus_probe_slot(slot); } } static int __init nubus_init(void) { - if (!MACH_IS_MAC) + if (!MACH_IS_MAC) return 0; /* Initialize the NuBus interrupts */ @@ -980,11 +949,11 @@ static int __init nubus_init(void) gurus can fix the real cause of the problem. */ mdelay(1000); #endif - + /* And probe */ - printk("NuBus: Scanning NuBus slots.\n"); + pr_info("NuBus: Scanning NuBus slots.\n"); nubus_devices = NULL; - nubus_boards = NULL; + nubus_boards = NULL; nubus_scan_bus(); nubus_proc_init(); return 0; diff --git a/include/uapi/linux/nubus.h b/include/uapi/linux/nubus.h index 77513d2..ac51606 100644 --- a/include/uapi/linux/nubus.h +++ b/include/uapi/linux/nubus.h @@ -113,13 +113,15 @@ enum nubus_drhw { NUBUS_DRHW_SIGMA_CLRMAX = 0x0007, /* Sigma Design ColorMax */ NUBUS_DRHW_APPLE_SE30 = 0x0009, /* Apple SE/30 video */ NUBUS_DRHW_APPLE_HRVC = 0x0013, /* Mac II High-Res Video Card */ + NUBUS_DRHW_APPLE_MVC = 0x0014, /* Mac II Monochrome Video Card */ NUBUS_DRHW_APPLE_PVC = 0x0017, /* Mac II Portrait Video Card */ NUBUS_DRHW_APPLE_RBV1 = 0x0018, /* IIci RBV video */ NUBUS_DRHW_APPLE_MDC = 0x0019, /* Macintosh Display Card */ + NUBUS_DRHW_APPLE_VSC = 0x0020, /* Duo MiniDock ViSC framebuffer */ NUBUS_DRHW_APPLE_SONORA = 0x0022, /* Sonora built-in video */ + NUBUS_DRHW_APPLE_JET = 0x0029, /* Jet framebuffer (DuoDock) */ NUBUS_DRHW_APPLE_24AC = 0x002b, /* Mac 24AC Video Card */ NUBUS_DRHW_APPLE_VALKYRIE = 0x002e, - NUBUS_DRHW_APPLE_JET = 0x0029, /* Jet framebuffer (DuoDock) */ NUBUS_DRHW_SMAC_GFX = 0x0105, /* SuperMac GFX */ NUBUS_DRHW_RASTER_CB264 = 0x013B, /* RasterOps ColorBoard 264 */ NUBUS_DRHW_MICRON_XCEED = 0x0146, /* Micron Exceed color */ |